diff options
author | Devin Heitmueller <dheitmueller@linuxtv.org> | 2009-03-11 02:00:47 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:43:25 -0400 |
commit | f1add5b5ec2a6efaa0f5648d0dc2c56d83a3ecf8 (patch) | |
tree | 2d44c29f61576e3b6ac88219a726415d9edd3a3b /drivers/media/video/au0828/au0828-core.c | |
parent | 4ff5ed44f84aed6727ec226853a1c6b03c36db5e (diff) |
V4L/DVB (11070): au0828: Rework the way the analog video binding occurs
Rework the way boards are managed so that we can change the board description
based on the Hauppauge eeprom (modeled after cx88-cards.c).
Also, make sure that we don't load the analog stack if there are no analog
inputs defined in the board profile.
Thanks to Michael Krufky <mkrufky@linuxtv.org> for providing information on
the various ways different Hauppauge boards can be configured.
Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/au0828/au0828-core.c')
-rw-r--r-- | drivers/media/video/au0828/au0828-core.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/media/video/au0828/au0828-core.c b/drivers/media/video/au0828/au0828-core.c index 680e88f6139..0bc85b7d67d 100644 --- a/drivers/media/video/au0828/au0828-core.c +++ b/drivers/media/video/au0828/au0828-core.c | |||
@@ -146,7 +146,8 @@ static void au0828_usb_disconnect(struct usb_interface *interface) | |||
146 | /* Digital TV */ | 146 | /* Digital TV */ |
147 | au0828_dvb_unregister(dev); | 147 | au0828_dvb_unregister(dev); |
148 | 148 | ||
149 | au0828_analog_unregister(dev); | 149 | if (dev->board.input != NULL) |
150 | au0828_analog_unregister(dev); | ||
150 | 151 | ||
151 | /* I2C */ | 152 | /* I2C */ |
152 | au0828_i2c_unregister(dev); | 153 | au0828_i2c_unregister(dev); |
@@ -189,7 +190,7 @@ static int au0828_usb_probe(struct usb_interface *interface, | |||
189 | mutex_init(&dev->mutex); | 190 | mutex_init(&dev->mutex); |
190 | mutex_init(&dev->dvb.lock); | 191 | mutex_init(&dev->dvb.lock); |
191 | dev->usbdev = usbdev; | 192 | dev->usbdev = usbdev; |
192 | dev->board = id->driver_info; | 193 | dev->boardnr = id->driver_info; |
193 | 194 | ||
194 | usb_set_intfdata(interface, dev); | 195 | usb_set_intfdata(interface, dev); |
195 | 196 | ||
@@ -230,14 +231,14 @@ static int au0828_usb_probe(struct usb_interface *interface, | |||
230 | au0828_card_setup(dev); | 231 | au0828_card_setup(dev); |
231 | 232 | ||
232 | /* Analog TV */ | 233 | /* Analog TV */ |
233 | au0828_analog_register(dev); | 234 | if (dev->board.input != NULL) |
235 | au0828_analog_register(dev); | ||
234 | 236 | ||
235 | /* Digital TV */ | 237 | /* Digital TV */ |
236 | au0828_dvb_register(dev); | 238 | au0828_dvb_register(dev); |
237 | 239 | ||
238 | printk(KERN_INFO "Registered device AU0828 [%s]\n", | 240 | printk(KERN_INFO "Registered device AU0828 [%s]\n", |
239 | au0828_boards[dev->board].name == NULL ? "Unset" : | 241 | dev->board.name == NULL ? "Unset" : dev->board.name); |
240 | au0828_boards[dev->board].name); | ||
241 | 242 | ||
242 | return 0; | 243 | return 0; |
243 | } | 244 | } |