aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/vme/bridges
diff options
context:
space:
mode:
authorMartyn Welch <martyn.welch@gefanuc.com>2009-08-11 13:50:49 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 12:02:10 -0700
commit75155020c8dc3aa38f8cabc95f17ccd8389c37b6 (patch)
tree4ad0910fa1cef89b3cf79fe6daadc0f8351fc516 /drivers/staging/vme/bridges
parent51a569f757f233bcffbffcdfeeff510916991a55 (diff)
Staging: vme: Add syncronize interrupts before removing callback
As identified by Jiri, there is no syncronisation before callback is removed. Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com> Cc: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vme/bridges')
-rw-r--r--drivers/staging/vme/bridges/vme_tsi148.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/staging/vme/bridges/vme_tsi148.c b/drivers/staging/vme/bridges/vme_tsi148.c
index cdc29198939..a4929ad3f08 100644
--- a/drivers/staging/vme/bridges/vme_tsi148.c
+++ b/drivers/staging/vme/bridges/vme_tsi148.c
@@ -480,6 +480,7 @@ int tsi148_request_irq(int level, int statid,
void tsi148_free_irq(int level, int statid)
{
u32 tmp;
+ struct pci_dev *pdev;
/* Get semaphore */
down(&(vme_irq));
@@ -495,6 +496,10 @@ void tsi148_free_irq(int level, int statid)
tmp = ioread32be(tsi148_bridge->base + TSI148_LCSR_INTEO);
tmp &= ~TSI148_LCSR_INTEO_IRQEO[level - 1];
iowrite32be(tmp, tsi148_bridge->base + TSI148_LCSR_INTEO);
+
+ pdev = container_of(tsi148_bridge->parent, struct pci_dev, dev);
+
+ synchronize_irq(pdev->irq);
}
tsi148_bridge->irq[level - 1].callback[statid].func = NULL;