---

yaml --- r: 44094 b: refs/heads/master c: ee579bc h: refs/heads/master v: v3
git-mirror · Dec 10, 2006 · c633091 · c633091
1 parent bfc92da
commit c633091
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8cc532ef5bf1230ed6345aebe5bd11ea8567ba52
+refs/heads/master: ee579bc9332ef8a67e20f512e7bc91e3efb92225
diff --git a/trunk/drivers/media/dvb/ttpci/budget-ci.c b/trunk/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;
 	}
@@ -1124,16 +1125,14 @@ 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;
 	}
 
 	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);