From c20c8368311f5af63cdce59f34238aaec8d7b968 Mon Sep 17 00:00:00 2001 From: Christopher Pascoe Date: Mon, 9 Jan 2006 15:25:28 -0200 Subject: [PATCH] --- yaml --- r: 17319 b: refs/heads/master c: 889aee805a0c286e33965cc678ea16672d6c5666 h: refs/heads/master i: 17317: 7c0993241ee7e65995daa6ee99ebbe63d08f2595 17315: 222341e38f82744c97216fcde54aa661baea8bea 17311: 469c48839f8041bdb2a07f0bf9cacb9b2b91e0d4 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/bttv-driver.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f3cb44e4acc3..4f02ef7d38e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e18828e43a52fb9a792938840cc32cbb2a9e1a5c +refs/heads/master: 889aee805a0c286e33965cc678ea16672d6c5666 diff --git a/trunk/drivers/media/video/bttv-driver.c b/trunk/drivers/media/video/bttv-driver.c index 4e25c92ac8c4..69a147b85f1a 100644 --- a/trunk/drivers/media/video/bttv-driver.c +++ b/trunk/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);