From 79dfa768d8bf472bc081341e0b88693a84d4ddd2 Mon Sep 17 00:00:00 2001 From: "Emilio G. Cota" Date: Fri, 12 Nov 2010 11:14:47 +0000 Subject: [PATCH] --- yaml --- r: 228099 b: refs/heads/master c: a82ad05ecd9dbd909509a332d3aa5f4ac439a054 h: refs/heads/master i: 228097: 94ebe67588c41447b7ab1cf40ed1b7244ce01b67 228095: f7e67f07c715dfde654cc506f533c52644a56709 v: v3 --- [refs] | 2 +- trunk/drivers/staging/vme/bridges/Module.symvers | 0 trunk/drivers/staging/vme/bridges/vme_tsi148.c | 11 +++++++---- 3 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 trunk/drivers/staging/vme/bridges/Module.symvers diff --git a/[refs] b/[refs] index b6b1d139ef55..a2dae544f195 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b12ef0b1f5d0358bc13cc716155d6e9b5584af48 +refs/heads/master: a82ad05ecd9dbd909509a332d3aa5f4ac439a054 diff --git a/trunk/drivers/staging/vme/bridges/Module.symvers b/trunk/drivers/staging/vme/bridges/Module.symvers new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/trunk/drivers/staging/vme/bridges/vme_tsi148.c b/trunk/drivers/staging/vme/bridges/vme_tsi148.c index 2f8f399df85b..70c9e41154e7 100644 --- a/trunk/drivers/staging/vme/bridges/vme_tsi148.c +++ b/trunk/drivers/staging/vme/bridges/vme_tsi148.c @@ -374,8 +374,11 @@ static int tsi148_irq_init(struct vme_bridge *tsi148_bridge) return 0; } -static void tsi148_irq_exit(struct tsi148_driver *bridge, struct pci_dev *pdev) +static void tsi148_irq_exit(struct vme_bridge *tsi148_bridge, + struct pci_dev *pdev) { + struct tsi148_driver *bridge = tsi148_bridge->driver_priv; + /* Turn off interrupts */ iowrite32be(0x0, bridge->base + TSI148_LCSR_INTEO); iowrite32be(0x0, bridge->base + TSI148_LCSR_INTEN); @@ -384,7 +387,7 @@ static void tsi148_irq_exit(struct tsi148_driver *bridge, struct pci_dev *pdev) iowrite32be(0xFFFFFFFF, bridge->base + TSI148_LCSR_INTC); /* Detach interrupt handler */ - free_irq(pdev->irq, pdev); + free_irq(pdev->irq, tsi148_bridge); } /* @@ -2511,7 +2514,7 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id) kfree(master_image); } - tsi148_irq_exit(tsi148_device, pdev); + tsi148_irq_exit(tsi148_bridge, pdev); err_irq: err_test: iounmap(tsi148_device->base); @@ -2583,7 +2586,7 @@ static void tsi148_remove(struct pci_dev *pdev) iowrite32be(0x0, bridge->base + TSI148_LCSR_INTM1); iowrite32be(0x0, bridge->base + TSI148_LCSR_INTM2); - tsi148_irq_exit(bridge, pdev); + tsi148_irq_exit(tsi148_bridge, pdev); vme_unregister_bridge(tsi148_bridge);