Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 200684
b: refs/heads/master
c: 7d9645f
h: refs/heads/master
v: v3
  • Loading branch information
Sergei Shtylyov authored and Greg Kroah-Hartman committed Jun 30, 2010
1 parent a070bd2 commit 2cdff62
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 48826626263d4a61d06fd8c5805da31f925aefa0
refs/heads/master: 7d9645fdca444d53907b22a4b73e3967efe09781
6 changes: 1 addition & 5 deletions trunk/drivers/usb/musb/musb_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -451,10 +451,6 @@ void musb_hnp_stop(struct musb *musb)
* @param power
*/

#define STAGE0_MASK (MUSB_INTR_RESUME | MUSB_INTR_SESSREQ \
| MUSB_INTR_VBUSERROR | MUSB_INTR_CONNECT \
| MUSB_INTR_RESET)

static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
u8 devctl, u8 power)
{
Expand Down Expand Up @@ -1598,7 +1594,7 @@ irqreturn_t musb_interrupt(struct musb *musb)
/* the core can interrupt us for multiple reasons; docs have
* a generic interrupt flowchart to follow
*/
if (musb->int_usb & STAGE0_MASK)
if (musb->int_usb)
retval |= musb_stage0_irq(musb, musb->int_usb,
devctl, power);

Expand Down

0 comments on commit 2cdff62

Please sign in to comment.