Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 200673
b: refs/heads/master
c: 2bb14cb
h: refs/heads/master
i:
  200671: 8833c4a
v: v3
  • Loading branch information
Maulik Mankad authored and Greg Kroah-Hartman committed Jun 30, 2010
1 parent d5f4172 commit b57a394
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 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: a5797a686f4c7cbced782959509d735cfa1344b1
refs/heads/master: 2bb14cbf04ded4b9e394a6ba9e4f06b82fbac8b2
3 changes: 2 additions & 1 deletion trunk/drivers/usb/musb/musb_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
handled = IRQ_HANDLED;
}


#endif
if (int_usb & MUSB_INTR_SUSPEND) {
DBG(1, "SUSPEND (%s) devctl %02x power %02x\n",
otg_state_string(musb), devctl, power);
Expand Down Expand Up @@ -705,6 +705,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
}
}

#ifdef CONFIG_USB_MUSB_HDRC_HCD
if (int_usb & MUSB_INTR_CONNECT) {
struct usb_hcd *hcd = musb_to_hcd(musb);
void __iomem *mbase = musb->mregs;
Expand Down

0 comments on commit b57a394

Please sign in to comment.