diff options
author | Christophe Fergeau <cfergeau@redhat.com> | 2016-02-11 18:04:46 +0200 |
---|---|---|
committer | Pavel Grunt <pgrunt@redhat.com> | 2016-02-18 08:39:07 +0100 |
commit | f84ae99f82c4c9f53ffb18c4740505a93256859d (patch) | |
tree | dbe9d88158a2fb3a89f0f5b5d9359f62672b6377 | |
parent | 7c85f88f265664c424c368b12d3a0f117beadf54 (diff) | |
download | spice-gtk-f84ae99f82c4c9f53ffb18c4740505a93256859d.tar.gz spice-gtk-f84ae99f82c4c9f53ffb18c4740505a93256859d.tar.xz spice-gtk-f84ae99f82c4c9f53ffb18c4740505a93256859d.zip |
Simplify spice_usb_device_manager_device_to_libdev()
The Windows-specific version duplicates some code from
spice_usb_device_equal_libdev(), this commit
switches to using that helper instead.
-rw-r--r-- | src/usb-device-manager.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/usb-device-manager.c b/src/usb-device-manager.c index fab919f..a3aa014 100644 --- a/src/usb-device-manager.c +++ b/src/usb-device-manager.c @@ -1935,7 +1935,6 @@ spice_usb_device_manager_device_to_libdev(SpiceUsbDeviceManager *self, */ libusb_device *d, **devlist; - int bus, addr; int i; g_return_val_if_fail(SPICE_IS_USB_DEVICE_MANAGER(self), NULL); @@ -1943,16 +1942,12 @@ spice_usb_device_manager_device_to_libdev(SpiceUsbDeviceManager *self, g_return_val_if_fail(self->priv != NULL, NULL); g_return_val_if_fail(self->priv->context != NULL, NULL); - /* On windows we match by vid / pid, since the address may change */ - bus = spice_usb_device_get_vid(device); - addr = spice_usb_device_get_pid(device); - libusb_get_device_list(self->priv->context, &devlist); if (!devlist) return NULL; for (i = 0; (d = devlist[i]) != NULL; i++) { - if (spice_usb_device_manager_libdev_match(d, bus, addr)) { + if (spice_usb_device_equal_libdev(device, d)) { libusb_ref_device(d); break; } |