V4L/DVB (3192): Fix bttv sub-device unregister

[karo-tx-linux.git] / drivers / media / video / bttv-driver.c

diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c
index 4e25c92ac8c4fef10d5ed003e854c21774fefac0..69a147b85f1a7bb4ac94779eecbc9f4cfcd2da2c 100644 (file)
--- 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,
        }
 
        /* 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");
 
@@ -4117,7 +4115,7 @@ static void __devexit bttv_remove(struct pci_dev *pci_dev)
        btv->shutdown=1;
        wake_up(&btv->gpioq);
        bttv_input_fini(btv);
-       //bttv_sub_del_devices(&btv->c);
+       bttv_sub_del_devices(&btv->c);
 
        /* unregister i2c_bus + input */
        fini_bttv_i2c(btv);