summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/cx88
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2014-09-05 09:37:09 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-11-03 08:35:56 -0200
commit98822de9ae22083658104e43d52f2cb0f3df1138 (patch)
treeb0023aced0621938a58b583ad6bf7031e5c6b435 /drivers/media/pci/cx88
parentc39ba330322ba087f4c814f641d1818137c98e95 (diff)
downloadlinux-98822de9ae22083658104e43d52f2cb0f3df1138.tar.bz2
[media] cx88: pci_disable_device comes after free_irq
Move pci_disable_device() down otherwise it will complain about an unfreed irq. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/pci/cx88')
-rw-r--r--drivers/media/pci/cx88/cx88-video.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
index d8a86cd4e455..a64ae31ae142 100644
--- a/drivers/media/pci/cx88/cx88-video.c
+++ b/drivers/media/pci/cx88/cx88-video.c
@@ -1571,12 +1571,12 @@ static void cx8800_finidev(struct pci_dev *pci_dev)
cx88_ir_stop(core);
cx88_shutdown(core); /* FIXME */
- pci_disable_device(pci_dev);
/* unregister stuff */
free_irq(pci_dev->irq, dev);
cx8800_unregister_video(dev);
+ pci_disable_device(pci_dev);
core->v4ldev = NULL;