Prev: [120/205] x86: Do not try to disable hpet if it hasnt been initialized before
Next: [128/205] USB: ehci-mxc: bail out on transceiver problems
From: Greg KH on 30 Jul 2010 14:20
2.6.34-stable review patch. If anyone has any objections, please let us know.

------------------

From: Sergei Shtylyov <sshtylyov(a)ru.mvista.com>

commit 7d9645fdca444d53907b22a4b73e3967efe09781 upstream.

Commit 1c25fda4a09e8229800979986ef399401053b46e (usb: musb: handle irqs in the
order dictated by programming guide) forgot to get rid of the old 'STAGE0_MASK'
filter for calling musb_stage0_irq(), so now disconnect and suspend interrupts
are effectively ignored...

Signed-off-by: Sergei Shtylyov <sshtylyov(a)ru.mvista.com>
Signed-off-by: Ajay Kumar Gupta <ajay.gupta(a)ti.com>
Acked-by: Felipe Balbi <felipe.balbi(a)nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
drivers/usb/musb/musb_core.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -371,10 +371,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)
{
@@ -1520,7 +1516,7 @@ irqreturn_t musb_interrupt(struct 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);



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [120/205] x86: Do not try to disable hpet if it hasnt been initialized before
Next: [128/205] USB: ehci-mxc: bail out on transceiver problems