[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/11] usb-ehci: cleanup port reset handling
From: |
Hans de Goede |
Subject: |
[Qemu-devel] [PATCH 06/11] usb-ehci: cleanup port reset handling |
Date: |
Fri, 24 Jun 2011 21:32:53 +0200 |
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 <address@hidden>
---
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 0b1cdaf..cfda374 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
- [Qemu-devel] RFC/PULL: usb: add support for companion controllers, Hans de Goede, 2011/06/24
- [Qemu-devel] [PATCH 01/11] usb: Add a register_companion USB bus op., Hans de Goede, 2011/06/24
- [Qemu-devel] [PATCH 02/11] usb: Make port wakeup and complete ops take a USBPort instead of a Device, Hans de Goede, 2011/06/24
- [Qemu-devel] [PATCH 03/11] usb: Replace device_destroy bus op with a child_detach port op, Hans de Goede, 2011/06/24
- [Qemu-devel] [PATCH 05/11] usb-ehci: Connect Status bit is read only, don't allow changing it by the guest, Hans de Goede, 2011/06/24
- [Qemu-devel] [PATCH 04/11] usb-ehci: drop unused num-ports state member, Hans de Goede, 2011/06/24
- [Qemu-devel] [PATCH 06/11] usb-ehci: cleanup port reset handling,
Hans de Goede <=
- [Qemu-devel] [PATCH 07/11] usb: assert on calling usb_attach(port, NULL) on a port without a dev, Hans de Goede, 2011/06/24
- [Qemu-devel] [PATCH 08/11] usb-ehci: Fix handling of PED and PEDC port status bits, Hans de Goede, 2011/06/24
- [Qemu-devel] [PATCH 09/11] usb-ehci: Add support for registering companion controllers, Hans de Goede, 2011/06/24
- [Qemu-devel] [PATCH 10/11] usb-uhci: Add support for being a companion controller, Hans de Goede, 2011/06/24