diff options
author | Gerd Hoffmann <kraxel@redhat.com> | 2011-10-28 16:13:50 +0200 |
---|---|---|
committer | Gerd Hoffmann <kraxel@redhat.com> | 2011-11-01 16:38:36 +0100 |
commit | 39fba3ada9a9e36a29a40e1acddec0923839c39b (patch) | |
tree | c2bb9f68615d8e7ef1d7f7685e8a794f11f1ab9e | |
parent | db80358a20e2597a0844998c832b2dce667d0aa0 (diff) |
usb-host: fix host close
The whole usb_host_close() function is skipped in case the device is not
in attached state. This is wrong though, only then usb_device_detach()
must be skipped, all other cleanup (especially device reset and closing
the file handle) still needs to be done. There are code paths where
usb_host_close() is called with the device in detached state already.
This fixes usb-host devices not being released and returned to the host
after removing them with device_del.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r-- | usb-linux.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usb-linux.c b/usb-linux.c index 7d4d1d7bcf..f086d57edb 100644 --- a/usb-linux.c +++ b/usb-linux.c @@ -1349,7 +1349,7 @@ static int usb_host_close(USBHostDevice *dev) { int i; - if (dev->fd == -1 || !dev->dev.attached) { + if (dev->fd == -1) { return -1; } @@ -1367,7 +1367,9 @@ static int usb_host_close(USBHostDevice *dev) } async_complete(dev); dev->closing = 0; - usb_device_detach(&dev->dev); + if (dev->dev.attached) { + usb_device_detach(&dev->dev); + } ioctl(dev->fd, USBDEVFS_RESET); close(dev->fd); dev->fd = -1; |