diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2014-09-05 08:37:09 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-11-03 05:35:56 -0500 |
commit | 98822de9ae22083658104e43d52f2cb0f3df1138 (patch) | |
tree | b0023aced0621938a58b583ad6bf7031e5c6b435 /drivers/media/pci/cx88 | |
parent | c39ba330322ba087f4c814f641d1818137c98e95 (diff) |
[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.c | 2 |
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) | |||
1571 | cx88_ir_stop(core); | 1571 | cx88_ir_stop(core); |
1572 | 1572 | ||
1573 | cx88_shutdown(core); /* FIXME */ | 1573 | cx88_shutdown(core); /* FIXME */ |
1574 | pci_disable_device(pci_dev); | ||
1575 | 1574 | ||
1576 | /* unregister stuff */ | 1575 | /* unregister stuff */ |
1577 | 1576 | ||
1578 | free_irq(pci_dev->irq, dev); | 1577 | free_irq(pci_dev->irq, dev); |
1579 | cx8800_unregister_video(dev); | 1578 | cx8800_unregister_video(dev); |
1579 | pci_disable_device(pci_dev); | ||
1580 | 1580 | ||
1581 | core->v4ldev = NULL; | 1581 | core->v4ldev = NULL; |
1582 | 1582 | ||