Skip to content

Commit

Permalink
Revert "USB: isp1760-hcd: move imask clear after pending work is done"
Browse files Browse the repository at this point in the history
This reverts commit 5808544.

To quote Richard:
	I don't think this should be mainlined. It was a
	misunderstanding on my part.  If you see all the other hdc
	drivers in the same location, they all do the same thing (i.e.
	clear the interrupt status first, then do the work) that
	"glitch" I think I saw was actually two back-to-back
	interrupts.

	Sebastian (the original author of isp1760) explained it to me a
	few days after my submission.

	sorry for the confusion

Cc: Richard Retanubun <RichardRetanubun@ruggedcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Greg Kroah-Hartman committed Apr 14, 2011
1 parent c41136b commit 753d853
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/usb/host/isp1760-hcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1676,15 +1676,13 @@ 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);
Expand Down

0 comments on commit 753d853

Please sign in to comment.