aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r--drivers/media/dvb/ttpci/budget-ci.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index b2869ab8b7b9..c34b5d3bdde5 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -202,6 +202,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
202 202
203 budget_ci->ir.dev = input_dev = input_allocate_device(); 203 budget_ci->ir.dev = input_dev = input_allocate_device();
204 if (!input_dev) { 204 if (!input_dev) {
205 printk(KERN_ERR "budget_ci: IR interface initialisation failed\n");
205 error = -ENOMEM; 206 error = -ENOMEM;
206 goto out1; 207 goto out1;
207 } 208 }
@@ -1124,7 +1125,7 @@ static int budget_ci_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
1124 struct budget_ci *budget_ci; 1125 struct budget_ci *budget_ci;
1125 int err; 1126 int err;
1126 1127
1127 budget_ci = kmalloc(sizeof(struct budget_ci), GFP_KERNEL); 1128 budget_ci = kzalloc(sizeof(struct budget_ci), GFP_KERNEL);
1128 if (!budget_ci) { 1129 if (!budget_ci) {
1129 err = -ENOMEM; 1130 err = -ENOMEM;
1130 goto out1; 1131 goto out1;
@@ -1132,8 +1133,6 @@ static int budget_ci_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
1132 1133
1133 dprintk(2, "budget_ci: %p\n", budget_ci); 1134 dprintk(2, "budget_ci: %p\n", budget_ci);
1134 1135
1135 budget_ci->budget.ci_present = 0;
1136
1137 dev->ext_priv = budget_ci; 1136 dev->ext_priv = budget_ci;
1138 1137
1139 err = ttpci_budget_init(&budget_ci->budget, dev, info, THIS_MODULE); 1138 err = ttpci_budget_init(&budget_ci->budget, dev, info, THIS_MODULE);