From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Fri, 5 Sep 2014 12:37:09 +0000 (-0300)
Subject: [media] cx88: pci_disable_device comes after free_irq
X-Git-Tag: android-x86-4.4-r3~477^2~298
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=98822de9ae22083658104e43d52f2cb0f3df1138;p=android-x86%2Fkernel.git

[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>
---

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;