Prev: [201/205] ACPI: processor: fix processor_physically_present on UP
Next: [191/205] ACPI / ACPICA: Fix GPE initialization
From: Greg KH on 30 Jul 2010 14:10
2.6.34-stable review patch. If anyone has any objections, please let us know.

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

From: Maulik Mankad <x0082077(a)ti.com>

commit 2bb14cbf04ded4b9e394a6ba9e4f06b82fbac8b2 upstream.

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(a)ti.com>
Cc: David Brownell <david-b(a)pacbell.net>
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 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -562,7 +562,7 @@ static irqreturn_t musb_stage0_irq(struc
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);
@@ -625,6 +625,7 @@ static irqreturn_t musb_stage0_irq(struc
}
}

+#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;


--
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: [201/205] ACPI: processor: fix processor_physically_present on UP
Next: [191/205] ACPI / ACPICA: Fix GPE initialization