diff options
author | Janne Grunau <janne-dvb@grunau.be> | 2008-09-21 19:50:11 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-12 07:37:02 -0400 |
commit | 26dc4d0487bb8b8de32d09c18a83c63d622156f2 (patch) | |
tree | c41500339124617937e53e3a098986a86d46f007 /drivers/media/dvb/ttpci/budget-av.c | |
parent | 8ca4dae3e601b527cb099ef72d821d7af075f8ae (diff) |
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-av.c')
-rw-r--r-- | drivers/media/dvb/ttpci/budget-av.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c index 839c94101b4e..1032ea77837e 100644 --- a/drivers/media/dvb/ttpci/budget-av.c +++ b/drivers/media/dvb/ttpci/budget-av.c | |||
@@ -57,6 +57,8 @@ | |||
57 | #define SLOTSTATUS_READY 8 | 57 | #define SLOTSTATUS_READY 8 |
58 | #define SLOTSTATUS_OCCUPIED (SLOTSTATUS_PRESENT|SLOTSTATUS_RESET|SLOTSTATUS_READY) | 58 | #define SLOTSTATUS_OCCUPIED (SLOTSTATUS_PRESENT|SLOTSTATUS_RESET|SLOTSTATUS_READY) |
59 | 59 | ||
60 | DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); | ||
61 | |||
60 | struct budget_av { | 62 | struct budget_av { |
61 | struct budget budget; | 63 | struct budget budget; |
62 | struct video_device *vd; | 64 | struct video_device *vd; |
@@ -1127,7 +1129,9 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio | |||
1127 | 1129 | ||
1128 | dev->ext_priv = budget_av; | 1130 | dev->ext_priv = budget_av; |
1129 | 1131 | ||
1130 | if ((err = ttpci_budget_init(&budget_av->budget, dev, info, THIS_MODULE))) { | 1132 | err = ttpci_budget_init(&budget_av->budget, dev, info, THIS_MODULE, |
1133 | adapter_nr); | ||
1134 | if (err) { | ||
1131 | kfree(budget_av); | 1135 | kfree(budget_av); |
1132 | return err; | 1136 | return err; |
1133 | } | 1137 | } |