From: Hans de Goede <hdegoede@redhat.com>
Date: Fri, 24 Jun 2011 12:26:18 +0000 (+0200)
Subject: usb: assert on calling usb_attach(port, NULL) on a port without a dev
X-Git-Tag: v0.15.0-rc0~62^2~13
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=45b9fd348061ab793cf4521bb3621f07a5bd7bf6;p=qemu.git

usb: assert on calling usb_attach(port, NULL) on a port without a dev

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 <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/hw/usb.c b/hw/usb.c
index 735ffd196..27a983ca5 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;
     }
 }