From: Martyn Welch Date: Tue, 11 Aug 2009 12:50:49 +0000 (+0100) Subject: Staging: vme: Add syncronize interrupts before removing callback X-Git-Tag: MMI-PSA29.97-13-9~26941^2~233 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=75155020c8dc3aa38f8cabc95f17ccd8389c37b6;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Cc: Jiri Slaby Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vme/bridges/vme_tsi148.c b/drivers/staging/vme/bridges/vme_tsi148.c index cdc291989391..a4929ad3f08a 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;