[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/3] usb-host: fix host close
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 3/3] usb-host: fix host close |
Date: |
Tue, 1 Nov 2011 15:56:30 +0100 |
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 <address@hidden>
---
usb-linux.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/usb-linux.c b/usb-linux.c
index 7d4d1d7..f086d57 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;
--
1.7.1
- Re: [Qemu-devel] [PATCH 1/3] usb-hub: wakeup on attach, (continued)
Re: [Qemu-devel] [PATCH 1/3] usb-hub: wakeup on attach, hkran, 2011/11/09
[Qemu-devel] [PATCH 2/3] usb: change VID/PID for usb-hub and usb-msd to prevent conflict, Gerd Hoffmann, 2011/11/01
[Qemu-devel] [PATCH 3/3] usb-host: fix host close,
Gerd Hoffmann <=
Re: [Qemu-devel] [PULL] usb patch queue, Anthony Liguori, 2011/11/01