vme: vme_ca91cx42.c: fix to pass correct device identity to free_irq()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Mon, 26 Aug 2013 04:04:05 +0000 (12:04 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 Aug 2013 04:49:26 +0000 (21:49 -0700)
free_irq() expects the same device identity that was passed to
corresponding request_irq(), otherwise the IRQ is not freed.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/vme/bridges/vme_ca91cx42.c

index 53a3f6a..f844857 100644 (file)
@@ -243,6 +243,8 @@ static int ca91cx42_irq_init(struct vme_bridge *ca91cx42_bridge)
 static void ca91cx42_irq_exit(struct ca91cx42_driver *bridge,
        struct pci_dev *pdev)
 {
+       struct vme_bridge *ca91cx42_bridge;
+
        /* Disable interrupts from PCI to VME */
        iowrite32(0, bridge->base + VINT_EN);
 
@@ -251,7 +253,9 @@ static void ca91cx42_irq_exit(struct ca91cx42_driver *bridge,
        /* Clear Any Pending PCI Interrupts */
        iowrite32(0x00FFFFFF, bridge->base + LINT_STAT);
 
-       free_irq(pdev->irq, pdev);
+       ca91cx42_bridge = container_of((void *)bridge, struct vme_bridge,
+                                      driver_priv);
+       free_irq(pdev->irq, ca91cx42_bridge);
 }
 
 static int ca91cx42_iack_received(struct ca91cx42_driver *bridge, int level)