[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/23] usb-ehci: cleanup port reset handling
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 09/23] usb-ehci: cleanup port reset handling |
Date: |
Fri, 8 Jul 2011 11:50:59 +0200 |
From: Hans de Goede <address@hidden>
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>
Signed-off-by: Gerd Hoffmann <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 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.1
- [Qemu-devel] [PULL] usb patch queue, Gerd Hoffmann, 2011/07/08
- [Qemu-devel] [PATCH 03/23] usb: Move (initial) call of usb_port_location to usb_fill_port, Gerd Hoffmann, 2011/07/08
- [Qemu-devel] [PATCH 04/23] usb: Add a register_companion USB bus op., Gerd Hoffmann, 2011/07/08
- [Qemu-devel] [PATCH 02/23] usb: Add a usb_fill_port helper function, Gerd Hoffmann, 2011/07/08
- [Qemu-devel] [PATCH 10/23] usb: assert on calling usb_attach(port, NULL) on a port without a dev, Gerd Hoffmann, 2011/07/08
- [Qemu-devel] [PATCH 09/23] usb-ehci: cleanup port reset handling,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 08/23] usb-ehci: Connect Status bit is read only, don't allow changing it by the guest, Gerd Hoffmann, 2011/07/08
- [Qemu-devel] [PATCH 11/23] usb-ehci: Fix handling of PED and PEDC port status bits, Gerd Hoffmann, 2011/07/08
- [Qemu-devel] [PATCH 01/23] hw/usb-musb.c: Don't misuse usb_packet_complete(), Gerd Hoffmann, 2011/07/08
- [Qemu-devel] [PATCH 07/23] usb-ehci: drop unused num-ports state member, Gerd Hoffmann, 2011/07/08
- [Qemu-devel] [PATCH 05/23] usb: Make port wakeup and complete ops take a USBPort instead of a Device, Gerd Hoffmann, 2011/07/08
- [Qemu-devel] [PATCH 14/23] usb-ohci: Add support for being a companion controller, Gerd Hoffmann, 2011/07/08
- [Qemu-devel] [PATCH 13/23] usb-uhci: Add support for being a companion controller, Gerd Hoffmann, 2011/07/08
- [Qemu-devel] [PATCH 06/23] usb: Replace device_destroy bus op with a child_detach port op, Gerd Hoffmann, 2011/07/08
- [Qemu-devel] [PATCH 12/23] usb-ehci: Add support for registering companion controllers, Gerd Hoffmann, 2011/07/08
- [Qemu-devel] [PATCH 16/23] uhci: add ich9 controllers, Gerd Hoffmann, 2011/07/08