39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
From afada27ad05658aae93aa8beab34b1b6885f63b9 Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Tue, 21 Jun 2011 12:23:40 +0200
|
|
Subject: [PATCH 09/35] usb-ehci: cleanup port reset handling
|
|
|
|
Doing a usb_attach when dev is NULL will just result in the
|
|
port detach op getting called even though nothing was connected in
|
|
the first place.
|
|
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
---
|
|
hw/usb-ehci.c | 7 +------
|
|
1 files changed, 1 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c
|
|
index ce1a432..d85e0a9 100644
|
|
--- a/hw/usb-ehci.c
|
|
+++ b/hw/usb-ehci.c
|
|
@@ -863,14 +863,9 @@ static void handle_port_status_write(EHCIState *s, int port, uint32_t val)
|
|
|
|
if (!(val & PORTSC_PRESET) &&(*portsc & PORTSC_PRESET)) {
|
|
trace_usb_ehci_port_reset(port, 0);
|
|
- usb_attach(&s->ports[port], dev);
|
|
-
|
|
- // TODO how to handle reset of ports with no device
|
|
if (dev) {
|
|
+ usb_attach(&s->ports[port], dev);
|
|
usb_send_msg(dev, USB_MSG_RESET);
|
|
- }
|
|
-
|
|
- if (s->ports[port].dev) {
|
|
*portsc &= ~PORTSC_CSC;
|
|
}
|
|
|
|
--
|
|
1.7.5.1
|
|
|