瀏覽代碼

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>
Christopher Pascoe 19 年之前
父節點
當前提交
889aee805a
共有 1 個文件被更改,包括 1 次插入3 次删除
  1. 1 3
      drivers/media/video/bttv-driver.c

+ 1 - 3
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);