aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Pascoe <c.pascoe@itee.uq.edu.au>2006-01-09 12:25:28 -0500
committerMauro Carvalho Chehab <mchehab@brturbo.com.br>2006-01-09 12:25:28 -0500
commit889aee805a0c286e33965cc678ea16672d6c5666 (patch)
treeb55ea752bc7051318c38be9fb1d68c1c8404ddfa
parente18828e43a52fb9a792938840cc32cbb2a9e1a5c (diff)
V4L/DVB (3192): Fix bttv sub-device unregister
- Fixes sub-device release for BTTV. Without this, DVB modules can't be reloaded Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
-rw-r--r--drivers/media/video/bttv-driver.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c
index 4e25c92ac8c4..69a147b85f1a 100644
--- a/drivers/media/video/bttv-driver.c
+++ b/drivers/media/video/bttv-driver.c
@@ -4075,8 +4075,6 @@ static int __devinit bttv_probe(struct pci_dev *dev,
4075 } 4075 }
4076 4076
4077 /* add subdevices */ 4077 /* add subdevices */
4078 if (btv->has_remote)
4079 bttv_sub_add_device(&btv->c, "remote");
4080 if (bttv_tvcards[btv->c.type].has_dvb) 4078 if (bttv_tvcards[btv->c.type].has_dvb)
4081 bttv_sub_add_device(&btv->c, "dvb"); 4079 bttv_sub_add_device(&btv->c, "dvb");
4082 4080
@@ -4117,7 +4115,7 @@ static void __devexit bttv_remove(struct pci_dev *pci_dev)
4117 btv->shutdown=1; 4115 btv->shutdown=1;
4118 wake_up(&btv->gpioq); 4116 wake_up(&btv->gpioq);
4119 bttv_input_fini(btv); 4117 bttv_input_fini(btv);
4120 //bttv_sub_del_devices(&btv->c); 4118 bttv_sub_del_devices(&btv->c);
4121 4119
4122 /* unregister i2c_bus + input */ 4120 /* unregister i2c_bus + input */
4123 fini_bttv_i2c(btv); 4121 fini_bttv_i2c(btv);