aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/ttpci/budget-ci.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/dvb/ttpci/budget-ci.c')
-rw-r--r--drivers/media/dvb/ttpci/budget-ci.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index 060e7c785326..0a5aad45435d 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -92,6 +92,8 @@ static int ir_debug;
92module_param(ir_debug, int, 0644); 92module_param(ir_debug, int, 0644);
93MODULE_PARM_DESC(ir_debug, "enable debugging information for IR decoding"); 93MODULE_PARM_DESC(ir_debug, "enable debugging information for IR decoding");
94 94
95DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
96
95struct budget_ci_ir { 97struct budget_ci_ir {
96 struct input_dev *dev; 98 struct input_dev *dev;
97 struct tasklet_struct msp430_irq_tasklet; 99 struct tasklet_struct msp430_irq_tasklet;
@@ -1153,7 +1155,7 @@ static void frontend_init(struct budget_ci *budget_ci)
1153 } 1155 }
1154 1156
1155 if (budget_ci->budget.dvb_frontend == NULL) { 1157 if (budget_ci->budget.dvb_frontend == NULL) {
1156 printk("budget-ci: A frontend driver was not found for device %04x/%04x subsystem %04x/%04x\n", 1158 printk("budget-ci: A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n",
1157 budget_ci->budget.dev->pci->vendor, 1159 budget_ci->budget.dev->pci->vendor,
1158 budget_ci->budget.dev->pci->device, 1160 budget_ci->budget.dev->pci->device,
1159 budget_ci->budget.dev->pci->subsystem_vendor, 1161 budget_ci->budget.dev->pci->subsystem_vendor,
@@ -1183,7 +1185,8 @@ static int budget_ci_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
1183 1185
1184 dev->ext_priv = budget_ci; 1186 dev->ext_priv = budget_ci;
1185 1187
1186 err = ttpci_budget_init(&budget_ci->budget, dev, info, THIS_MODULE); 1188 err = ttpci_budget_init(&budget_ci->budget, dev, info, THIS_MODULE,
1189 adapter_nr);
1187 if (err) 1190 if (err)
1188 goto out2; 1191 goto out2;
1189 1192