Skip to content

Commit

Permalink
V4L/DVB (3192): Fix bttv sub-device unregister
Browse files Browse the repository at this point in the history
- 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>
  • Loading branch information
Christopher Pascoe authored and Mauro Carvalho Chehab committed Jan 9, 2006
1 parent e18828e commit 889aee8
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/media/video/bttv-driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 889aee8

Please sign in to comment.