| Message ID | 1401096012-6895-2-git-send-email-george.cherian@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* George Cherian <george.cherian@ti.com> [140526 02:25]: > BABBLE and RESET share the same interrupt. The interrupt > is considered to be RESET if MUSB is in peripheral mode and > as a BABBLE if MUSB is in HOST mode. > > Handle babble condition iff MUSB is in HOST mode. Please get this into mainline kernel for v3.16-rc. Fixes: ca88fc2ef0d7 (usb: musb: add a work_struct to recover from babble errors) Tested-by: Tony Lindgren <tony@atomide.com> > Signed-off-by: George Cherian <george.cherian@ti.com> > --- > drivers/usb/musb/musb_core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c > index 3c6043c..0ad9551 100644 > --- a/drivers/usb/musb/musb_core.c > +++ b/drivers/usb/musb/musb_core.c > @@ -849,7 +849,7 @@ b_host: > } > > /* handle babble condition */ > - if (int_usb & MUSB_INTR_BABBLE) > + if (int_usb & MUSB_INTR_BABBLE && is_host_active(musb)) > schedule_work(&musb->recover_work); > > #if 0 > -- > 1.8.3.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On Thu, Jun 19, 2014 at 03:44:42AM -0700, Tony Lindgren wrote: > * George Cherian <george.cherian@ti.com> [140526 02:25]: > > BABBLE and RESET share the same interrupt. The interrupt > > is considered to be RESET if MUSB is in peripheral mode and > > as a BABBLE if MUSB is in HOST mode. > > > > Handle babble condition iff MUSB is in HOST mode. > > Please get this into mainline kernel for v3.16-rc. will do. Finishing up my series of build-tests, you should receive confirmation that the patch applied in a few hours.
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 3c6043c..0ad9551 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -849,7 +849,7 @@ b_host: } /* handle babble condition */ - if (int_usb & MUSB_INTR_BABBLE) + if (int_usb & MUSB_INTR_BABBLE && is_host_active(musb)) schedule_work(&musb->recover_work); #if 0
BABBLE and RESET share the same interrupt. The interrupt is considered to be RESET if MUSB is in peripheral mode and as a BABBLE if MUSB is in HOST mode. Handle babble condition iff MUSB is in HOST mode. Signed-off-by: George Cherian <george.cherian@ti.com> --- drivers/usb/musb/musb_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)