[5/9] ehci: Kick async schedule on wakeup in the non companion case

Message ID 1341829233-24381-7-git-send-email-kraxel@redhat.com
State New
Headers show

Commit Message

Gerd Hoffmann July 9, 2012, 10:20 a.m.
From: Hans de Goede <hdegoede@redhat.com>

Commit 0f588df8b3688b00e77aabaa32e26ece5f19bd39, added code
to ehci_wakeup to kick the async schedule on wakeup, but the else
was positioned wrong making it trigger for devices which are routed
to the companion rather then to the ehci controller itself.

This patch fixes this. Note that the "programming style" with using the
return at the end of the companion block matches how the companion case
is handled in the other ports ops, and is done this way for consistency.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
 hw/usb/hcd-ehci.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
index f612610..080f62c 100644
--- a/hw/usb/hcd-ehci.c
+++ b/hw/usb/hcd-ehci.c
@@ -905,10 +905,11 @@  static void ehci_wakeup(USBPort *port)
         USBPort *companion = s->companion_ports[port->index];
         if (companion->ops->wakeup) {
-        } else {
-            qemu_bh_schedule(s->async_bh);
+        return;
+    qemu_bh_schedule(s->async_bh);
 static int ehci_register_companion(USBBus *bus, USBPort *ports[],