diff options
| author | Janne Grunau <janne-dvb@grunau.be> | 2008-09-22 01:50:11 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-12 13:37:02 +0200 |
| commit | 26dc4d0487bb8b8de32d09c18a83c63d622156f2 (patch) | |
| tree | c41500339124617937e53e3a098986a86d46f007 /drivers/media/dvb/ttpci/budget-patch.c | |
| parent | V4L/DVB (8962): zr36067: VIDIOC_S_FMT returns the colorspace value (diff) | |
| download | linux-26dc4d0487bb8b8de32d09c18a83c63d622156f2.tar.xz linux-26dc4d0487bb8b8de32d09c18a83c63d622156f2.zip | |
V4L/DVB (8964): dvb/budget: push adapter_nr mod option down to individual drivers
adapter_nr mod option does not make sense for budget-core since it is only
common code shared by all budget drivers
Signed-off-by: Janne Grunau <janne-dvb@grunau.be>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/ttpci/budget-patch.c')
| -rw-r--r-- | drivers/media/dvb/ttpci/budget-patch.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c index bbd234fe11c1..60136688a9a4 100644 --- a/drivers/media/dvb/ttpci/budget-patch.c +++ b/drivers/media/dvb/ttpci/budget-patch.c @@ -39,6 +39,8 @@ #include "bsru6.h" +DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); + #define budget_patch budget static struct saa7146_extension budget_extension; @@ -592,8 +594,9 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte dprintk(2, "budget: %p\n", budget); - if ((err = ttpci_budget_init (budget, dev, info, THIS_MODULE))) { - kfree (budget); + err = ttpci_budget_init(budget, dev, info, THIS_MODULE, adapter_nr); + if (err) { + kfree(budget); return err; } |