From: Richard Retanubun <RichardRetanubun@ruggedcom.com>
Date: Thu, 17 Mar 2011 21:39:28 +0000 (-0400)
Subject: USB: isp1760-hcd: move imask clear after pending work is done
X-Git-Tag: v2.6.39-rc4~16^2~13
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5808544690300071f09eef9ab83a0fb1f60cf1cd;p=~emulex%2Finfiniband.git

USB: isp1760-hcd: move imask clear after pending work is done

This patch moves the HcInterrupt register write to clear the
pending interrupt to after the isr work is done, doing this removes
glitches in the irq line.

Signed-off-by: Richard Retanubun <richardretanubun@ruggedcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c
index 795345ad45e..564b03337e7 100644
--- a/drivers/usb/host/isp1760-hcd.c
+++ b/drivers/usb/host/isp1760-hcd.c
@@ -1676,13 +1676,15 @@ static irqreturn_t isp1760_irq(struct usb_hcd *hcd)
 	if (unlikely(!imask))
 		goto leave;
 
-	reg_write32(hcd->regs, HC_INTERRUPT_REG, imask);
 	if (imask & (HC_ATL_INT | HC_SOT_INT))
 		do_atl_int(hcd);
 
 	if (imask & HC_INTL_INT)
 		do_intl_int(hcd);
 
+	/* Clear interrupt mask on device after the work is done */
+	reg_write32(hcd->regs, HC_INTERRUPT_REG, imask);
+
 	irqret = IRQ_HANDLED;
 leave:
 	spin_unlock(&priv->lock);