mirror of
https://github.com/rd-stuffs/msm-4.14.git
synced 2025-02-20 11:45:48 +08:00
usb: musb: Fix a bug by making suspend interrupt available in device mode
As a part of aligning the ISR code for MUSB with the specs, the ISR code was re-written. See Commit 1c25fda4a09e8229800979986ef399401053b46e (usb: musb: handle irqs in the order dictated by programming guide) With this the suspend interrupt came accidently under CONFIG_USB_MUSB_HDRC_HCD. The fix brings suspend interrupt handling outside CONFIG_USB_MUSB_HDRC_HCD. Signed-off-by: Maulik Mankad <x0082077@ti.com> Cc: David Brownell <david-b@pacbell.net> Acked-by: Felipe Balbi <felipe.balbi@nokia.com> Cc: stable <stable@kernel.org> [.34] Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
a5797a686f
commit
2bb14cbf04
@ -642,7 +642,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
|
|||||||
handled = IRQ_HANDLED;
|
handled = IRQ_HANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
if (int_usb & MUSB_INTR_SUSPEND) {
|
if (int_usb & MUSB_INTR_SUSPEND) {
|
||||||
DBG(1, "SUSPEND (%s) devctl %02x power %02x\n",
|
DBG(1, "SUSPEND (%s) devctl %02x power %02x\n",
|
||||||
otg_state_string(musb), devctl, power);
|
otg_state_string(musb), devctl, power);
|
||||||
@ -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) {
|
if (int_usb & MUSB_INTR_CONNECT) {
|
||||||
struct usb_hcd *hcd = musb_to_hcd(musb);
|
struct usb_hcd *hcd = musb_to_hcd(musb);
|
||||||
void __iomem *mbase = musb->mregs;
|
void __iomem *mbase = musb->mregs;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user