summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorAndrew de Quincey <adq_dvb@lidskialf.net>2006-11-22 21:02:32 +0000
committerAndrew de Quincey <adq_dvb@lidskialf.net>2006-11-22 21:02:32 +0000
commited706037e5ded7b8c6eac4f54233f22f5c3546fd (patch)
tree2899dfe9010ed72c27425c66513fc6f74f0fea07 /linux
parentfdeda4d783d96704c5ae4a4901e9dad99f1a73c0 (diff)
downloadmediapointer-dvb-s2-ed706037e5ded7b8c6eac4f54233f22f5c3546fd.tar.gz
mediapointer-dvb-s2-ed706037e5ded7b8c6eac4f54233f22f5c3546fd.tar.bz2
[PATCH 4/8] budget-ci IR: be more verbose in case of init failure
Trivial change to help the user understand what went wrong. Taken from Darren Salt's dvb-ir patchset. Signed-off-by: Darren Salt <linux@youmustbejoking.demon.co.uk> Signed-off-by: David Härdeman <david@hardeman.nu> Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/dvb/ttpci/budget-ci.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/ttpci/budget-ci.c b/linux/drivers/media/dvb/ttpci/budget-ci.c
index ce368d5f8..7d6a85827 100644
--- a/linux/drivers/media/dvb/ttpci/budget-ci.c
+++ b/linux/drivers/media/dvb/ttpci/budget-ci.c
@@ -202,6 +202,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
budget_ci->ir.dev = input_dev = input_allocate_device();
if (!input_dev) {
+ printk(KERN_ERR "budget_ci: IR interface initialisation failed\n");
error = -ENOMEM;
goto out1;
}
@@ -1130,7 +1131,7 @@ static int budget_ci_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
struct budget_ci *budget_ci;
int err;
- budget_ci = kmalloc(sizeof(struct budget_ci), GFP_KERNEL);
+ budget_ci = kzalloc(sizeof(struct budget_ci), GFP_KERNEL);
if (!budget_ci) {
err = -ENOMEM;
goto out1;
@@ -1138,8 +1139,6 @@ static int budget_ci_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
dprintk(2, "budget_ci: %p\n", budget_ci);
- budget_ci->budget.ci_present = 0;
-
dev->ext_priv = budget_ci;
err = ttpci_budget_init(&budget_ci->budget, dev, info, THIS_MODULE);