Commit ee579bc9 authored by David Hardeman's avatar David Hardeman Committed by Mauro Carvalho Chehab

V4L/DVB (4878): 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: default avatarDarren Salt <linux@youmustbejoking.demon.co.uk>
Signed-off-by: default avatarDavid Hardeman <david@hardeman.nu>
Signed-off-by: default avatarAndrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 8cc532ef
...@@ -202,6 +202,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci) ...@@ -202,6 +202,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
budget_ci->ir.dev = input_dev = input_allocate_device(); budget_ci->ir.dev = input_dev = input_allocate_device();
if (!input_dev) { if (!input_dev) {
printk(KERN_ERR "budget_ci: IR interface initialisation failed\n");
error = -ENOMEM; error = -ENOMEM;
goto out1; goto out1;
} }
...@@ -1124,7 +1125,7 @@ static int budget_ci_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio ...@@ -1124,7 +1125,7 @@ static int budget_ci_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
struct budget_ci *budget_ci; struct budget_ci *budget_ci;
int err; int err;
budget_ci = kmalloc(sizeof(struct budget_ci), GFP_KERNEL); budget_ci = kzalloc(sizeof(struct budget_ci), GFP_KERNEL);
if (!budget_ci) { if (!budget_ci) {
err = -ENOMEM; err = -ENOMEM;
goto out1; goto out1;
...@@ -1132,8 +1133,6 @@ static int budget_ci_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio ...@@ -1132,8 +1133,6 @@ static int budget_ci_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
dprintk(2, "budget_ci: %p\n", budget_ci); dprintk(2, "budget_ci: %p\n", budget_ci);
budget_ci->budget.ci_present = 0;
dev->ext_priv = budget_ci; dev->ext_priv = budget_ci;
err = ttpci_budget_init(&budget_ci->budget, dev, info, THIS_MODULE); err = ttpci_budget_init(&budget_ci->budget, dev, info, THIS_MODULE);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment