diff options
| -rw-r--r-- | linux/drivers/media/video/bttv-driver.c | 6 | ||||
| -rw-r--r-- | v4l/ChangeLog | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c index eb9a46747..b5cba028f 100644 --- a/linux/drivers/media/video/bttv-driver.c +++ b/linux/drivers/media/video/bttv-driver.c @@ -1,5 +1,5 @@ /* - $Id: bttv-driver.c,v 1.82 2005/12/17 19:12:23 mchehab Exp $ + $Id: bttv-driver.c,v 1.83 2005/12/18 18:45:21 rmcc Exp $ bttv - Bt848 frame grabber driver @@ -4116,8 +4116,6 @@ static int __devinit bttv_probe(struct pci_dev *dev, #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) /* add subdevices */ - if (btv->has_remote) - bttv_sub_add_device(&btv->c, "remote"); if (bttv_tvcards[btv->c.type].has_dvb) bttv_sub_add_device(&btv->c, "dvb"); #endif @@ -4160,7 +4158,7 @@ static void __devexit bttv_remove(struct pci_dev *pci_dev) wake_up(&btv->gpioq); bttv_input_fini(btv); #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - //bttv_sub_del_devices(&btv->c); + bttv_sub_del_devices(&btv->c); #endif /* unregister i2c_bus + input */ diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 34d331b6b..d39f4743a 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,13 @@ +2005-12-18 18:41 rmcc + + * linux/drivers/media/video/bttv-driver.c: + + - Re-enable sub-device release at bttv-driver, to fix DVB driver + reload + + Signed-off-by: Christopher Pascoe <c.pascoe@itee.uq.edu.au> + Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org> + 2005-12-18 01:02 hverkuil * linux/drivers/media/video/saa7127.c: (saa7127_set_cc), |