diff options
author | Martyn Welch <martyn.welch@gefanuc.com> | 2009-08-11 08:50:49 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 15:02:10 -0400 |
commit | 75155020c8dc3aa38f8cabc95f17ccd8389c37b6 (patch) | |
tree | 4ad0910fa1cef89b3cf79fe6daadc0f8351fc516 /drivers | |
parent | 51a569f757f233bcffbffcdfeeff510916991a55 (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')
-rw-r--r-- | drivers/staging/vme/bridges/vme_tsi148.c | 5 |
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, | |||
480 | void tsi148_free_irq(int level, int statid) | 480 | void tsi148_free_irq(int level, int statid) |
481 | { | 481 | { |
482 | u32 tmp; | 482 | u32 tmp; |
483 | struct pci_dev *pdev; | ||
483 | 484 | ||
484 | /* Get semaphore */ | 485 | /* Get semaphore */ |
485 | down(&(vme_irq)); | 486 | down(&(vme_irq)); |
@@ -495,6 +496,10 @@ void tsi148_free_irq(int level, int statid) | |||
495 | tmp = ioread32be(tsi148_bridge->base + TSI148_LCSR_INTEO); | 496 | tmp = ioread32be(tsi148_bridge->base + TSI148_LCSR_INTEO); |
496 | tmp &= ~TSI148_LCSR_INTEO_IRQEO[level - 1]; | 497 | tmp &= ~TSI148_LCSR_INTEO_IRQEO[level - 1]; |
497 | iowrite32be(tmp, tsi148_bridge->base + TSI148_LCSR_INTEO); | 498 | iowrite32be(tmp, tsi148_bridge->base + TSI148_LCSR_INTEO); |
499 | |||
500 | pdev = container_of(tsi148_bridge->parent, struct pci_dev, dev); | ||
501 | |||
502 | synchronize_irq(pdev->irq); | ||
498 | } | 503 | } |
499 | 504 | ||
500 | tsi148_bridge->irq[level - 1].callback[statid].func = NULL; | 505 | tsi148_bridge->irq[level - 1].callback[statid].func = NULL; |