diff mbox

[13/14] usb-bus: Don't detach non attached devices on device exit

Message ID 1306834530-12763-14-git-send-email-hdegoede@redhat.com
State New
Headers show

Commit Message

Hans de Goede May 31, 2011, 9:35 a.m. UTC 
This causes an "Error: tried to detach unattached usb device " to be printed,
this can happen when deleting ie a usb host qdev, which did not
get attached (because a device matching the filter never got plugged in).
---
 hw/usb-bus.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

Comments

Gerd Hoffmann June 1, 2011, 12:51 p.m. UTC | #1 
On 05/31/11 11:35, Hans de Goede wrote:
> This causes an "Error: tried to detach unattached usb device " to be printed,
> this can happen when deleting ie a usb host qdev, which did not
> get attached (because a device matching the filter never got plugged in).

Patch applied.

thanks,
   Gerd
diff mbox

Patch

diff --git a/hw/usb-bus.c b/hw/usb-bus.c
index bb040d2..0a49921 100644
--- a/hw/usb-bus.c
+++ b/hw/usb-bus.c
@@ -84,7 +84,9 @@  static int usb_qdev_exit(DeviceState *qdev)
     USBDevice *dev = DO_UPCAST(USBDevice, qdev, qdev);
     USBBus *bus = usb_bus_from_device(dev);
 
-    usb_device_detach(dev);
+    if (dev->attached) {
+        usb_device_detach(dev);
+    }
     bus->ops->device_destroy(bus, dev);
     if (dev->info->handle_destroy) {
         dev->info->handle_destroy(dev);