From a7466b2ff8e1cbdf3abf08a935c3b6c19303ffc2 Mon Sep 17 00:00:00 2001

From: Hans de Goede <hdegoede@redhat.com>

Date: Fri, 24 Jun 2011 14:26:18 +0200

Subject: [PATCH 10/35] 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>

---

 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