diff options
| author | Devin Heitmueller <dheitmueller@linuxtv.org> | 2009-03-11 02:00:47 -0400 |
|---|---|---|
| committer | Devin Heitmueller <dheitmueller@linuxtv.org> | 2009-03-11 02:00:47 -0400 |
| commit | 3c1c7dc1d05a143350b6c3467e6bf52144189db0 (patch) | |
| tree | cd88864283a947cd6cd245a7a0849cea44aa2601 /linux/drivers/media/video/au0828/au0828-core.c | |
| parent | 7f62cf2d7360ac3b7f2fac64950706a588db8977 (diff) | |
| download | mediapointer-dvb-s2-3c1c7dc1d05a143350b6c3467e6bf52144189db0.tar.gz mediapointer-dvb-s2-3c1c7dc1d05a143350b6c3467e6bf52144189db0.tar.bz2 | |
au0828: Rework the way the analog video binding occurs
From: Devin Heitmueller <dheitmueller@linuxtv.org>
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.
Priority: normal
Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/video/au0828/au0828-core.c')
| -rw-r--r-- | linux/drivers/media/video/au0828/au0828-core.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/linux/drivers/media/video/au0828/au0828-core.c b/linux/drivers/media/video/au0828/au0828-core.c index 0ed270d22..4eca268bb 100644 --- a/linux/drivers/media/video/au0828/au0828-core.c +++ b/linux/drivers/media/video/au0828/au0828-core.c @@ -147,7 +147,8 @@ static void au0828_usb_disconnect(struct usb_interface *interface) /* Digital TV */ au0828_dvb_unregister(dev); - au0828_analog_unregister(dev); + if (dev->board.input != NULL) + au0828_analog_unregister(dev); /* I2C */ au0828_i2c_unregister(dev); @@ -190,7 +191,7 @@ static int au0828_usb_probe(struct usb_interface *interface, mutex_init(&dev->mutex); mutex_init(&dev->dvb.lock); dev->usbdev = usbdev; - dev->board = id->driver_info; + dev->boardnr = id->driver_info; usb_set_intfdata(interface, dev); @@ -231,14 +232,14 @@ static int au0828_usb_probe(struct usb_interface *interface, au0828_card_setup(dev); /* Analog TV */ - au0828_analog_register(dev); + if (dev->board.input != NULL) + au0828_analog_register(dev); /* Digital TV */ au0828_dvb_register(dev); printk(KERN_INFO "Registered device AU0828 [%s]\n", - au0828_boards[dev->board].name == NULL ? "Unset" : - au0828_boards[dev->board].name); + dev->board.name == NULL ? "Unset" : dev->board.name); return 0; } |