summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2015-04-03 08:13:14 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-05-01 06:59:54 -0300
commitde73e1321c263aa6760ca79b99af2600c9b4ac32 (patch)
tree058fb56fafbcf75464b00ac97e6c9e9197558288
parent9450684b7439202f62a37183104b31d884ff0de3 (diff)
downloadop-kernel-dev-de73e1321c263aa6760ca79b99af2600c9b4ac32.zip
op-kernel-dev-de73e1321c263aa6760ca79b99af2600c9b4ac32.tar.gz
[media] bttv: fix missing irq after reloading driver
If pci_disable_device() isn't called when the driver is removed, then the next time when it is loaded the irq isn't found. I'm pretty sure this used to work in the past, but calling pci_disable_device() is clearly the correct method and this makes it work again. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/pci/bt8xx/bttv-driver.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index 0f10e05..3632958 100644
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -4239,6 +4239,7 @@ fail0:
iounmap(btv->bt848_mmio);
release_mem_region(pci_resource_start(btv->c.pci,0),
pci_resource_len(btv->c.pci,0));
+ pci_disable_device(btv->c.pci);
return result;
}
@@ -4282,6 +4283,7 @@ static void bttv_remove(struct pci_dev *pci_dev)
iounmap(btv->bt848_mmio);
release_mem_region(pci_resource_start(btv->c.pci,0),
pci_resource_len(btv->c.pci,0));
+ pci_disable_device(btv->c.pci);
v4l2_device_unregister(&btv->c.v4l2_dev);
bttvs[btv->c.nr] = NULL;
OpenPOWER on IntegriCloud