[PATCH 2/9] pxa25x_udc: Use disable_irq_nosync() from within irqhandlers.

From: Ben Nizette
Date: Thu Apr 16 2009 - 01:55:38 EST



disable_irq() should wait for all running handlers to complete
before returning. As such, if it's used to disable an interrupt
from that interrupt's handler it will deadlock. This replaces
the dangerous instances with the _nosync() variant which doesn't
have this problem.

Signed-off-by: Ben Nizette <bn@xxxxxxxxxxxxxxx>
---
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index 0ce4e28..6ab6f26 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -1382,12 +1382,12 @@ lubbock_vbus_irq(int irq, void *_dev)
switch (irq) {
case LUBBOCK_USB_IRQ:
vbus = 1;
- disable_irq(LUBBOCK_USB_IRQ);
+ disable_irq_nosync(LUBBOCK_USB_IRQ);
enable_irq(LUBBOCK_USB_DISC_IRQ);
break;
case LUBBOCK_USB_DISC_IRQ:
vbus = 0;
- disable_irq(LUBBOCK_USB_DISC_IRQ);
+ disable_irq_nosync(LUBBOCK_USB_DISC_IRQ);
enable_irq(LUBBOCK_USB_IRQ);
break;
default:
--
1.6.0.2



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/