RPCS3/libusb
1
0
Fork 0
mirror of https://github.com/RPCS3/libusb.git synced 2026-07-21 00:16:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

linux_usbfs: Only remove the device fd from the pollfd list once

Browse Source 
If the file descriptor gets removed because POLLERR has been
detected, do not attempt to remove it again when closing the device.

Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
This commit is contained in:
Chris Dickens
2015-09-17 22:27:19 -07:00
parent 6d5ffa0c7f
commit eb532c002b
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libusb/os/linux_usbfs.c
+10 -3
View File
@@ -144,6 +144,7 @@ struct linux_device_priv {
struct linux_device_handle_priv {
int fd;
int fd_removed;
uint32_t caps;
};
@@ -1324,9 +1325,11 @@ static int op_open(struct libusb_device_handle *handle)
static void op_close(struct libusb_device_handle *dev_handle)
{
int fd = _device_handle_priv(dev_handle)->fd;
usbi_remove_pollfd(HANDLE_CTX(dev_handle), fd);
close(fd);
struct linux_device_handle_priv *hpriv = _device_handle_priv(dev_handle);
/* fd may have already been removed by POLLERR condition in op_handle_events() */
if (!hpriv->fd_removed)
usbi_remove_pollfd(HANDLE_CTX(dev_handle), hpriv->fd);
close(hpriv->fd);
}
static int op_get_configuration(struct libusb_device_handle *handle,
@@ -2595,7 +2598,11 @@ static int op_handle_events(struct libusb_context *ctx,
}
if (pollfd->revents & POLLERR) {
/* remove the fd from the pollfd set so that it doesn't continuously
* trigger an event, and flag that it has been removed so op_close()
* doesn't try to remove it a second time */
usbi_remove_pollfd(HANDLE_CTX(handle), hpriv->fd);
hpriv->fd_removed = 1;
usbi_handle_disconnect(handle);
/* device will still be marked as attached if hotplug monitor thread
* hasn't processed remove event yet */
libusb/version_nano.h
+1 -1
View File
@@ -1 +1 @@
#define LIBUSB_NANO 11006
#define LIBUSB_NANO 11007