[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/11] usb: assert on calling usb_attach(port, NULL)
From: |
Hans de Goede |
Subject: |
[Qemu-devel] [PATCH 07/11] usb: assert on calling usb_attach(port, NULL) on a port without a dev |
Date: |
Fri, 24 Jun 2011 21:32:54 +0200 |
with the "usb-ehci: cleanup port reset handling" patch in place no callers
are calling usb_attach(port, NULL) for a port where port->dev is NULL.
Doing that makes no sense as that causes the port detach op to get called
for a port with nothing attached. Add an assert that port->dev != NULL when
dev == NULL, and remove the check for not having a port->dev in the dev == NULL
case.
Signed-off-by: Hans de Goede <address@hidden>
---
hw/usb.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/hw/usb.c b/hw/usb.c
index 735ffd1..27a983c 100644
--- a/hw/usb.c
+++ b/hw/usb.c
@@ -40,12 +40,11 @@ void usb_attach(USBPort *port, USBDevice *dev)
} else {
/* detach */
dev = port->dev;
+ assert(dev);
port->ops->detach(port);
- if (dev) {
- usb_send_msg(dev, USB_MSG_DETACH);
- dev->port = NULL;
- port->dev = NULL;
- }
+ usb_send_msg(dev, USB_MSG_DETACH);
+ dev->port = NULL;
+ port->dev = NULL;
}
}
--
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, 2011/06/24
- [Qemu-devel] [PATCH 07/11] usb: assert on calling usb_attach(port, NULL) on a port without a dev,
Hans de Goede <=
- [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
[Qemu-devel] [PATCH 11/11] usb-ohci: Add support for being a companion controller, Hans de Goede, 2011/06/24