Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(681)

Side by Side Diff: third_party/libusb/composite-hid-close.patch

Issue 1032563002: libusb: Fix composite_close to close HID handles as well. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/libusb/README.chromium ('k') | third_party/libusb/src/libusb/os/windows_usb.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 diff --git a/libusb/os/windows_usb.c b/libusb/os/windows_usb.c
2 index 9ae11b1..259897e 100644
3 --- a/libusb/os/windows_usb.c
4 +++ b/libusb/os/windows_usb.c
5 @@ -4236,6 +4236,7 @@ static void composite_close(int sub_api, struct libusb_dev ice_handle *dev_handle
6 struct windows_device_priv *priv = _device_priv(dev_handle->dev);
7 uint8_t i;
8 bool available[SUB_API_MAX];
9 + bool has_hid = false;
10
11 for (i = 0; i<SUB_API_MAX; i++) {
12 available[i] = false;
13 @@ -4245,6 +4246,8 @@ static void composite_close(int sub_api, struct libusb_dev ice_handle *dev_handle
14 if ( (priv->usb_interface[i].apib->id == USB_API_WINUSBX)
15 && (priv->usb_interface[i].sub_api != SUB_API_NOTSET) ) {
16 available[priv->usb_interface[i].sub_api] = true;
17 + } else if (priv->usb_interface[i].apib->id == USB_API_HID) {
18 + has_hid = true;
19 }
20 }
21
22 @@ -4253,6 +4256,10 @@ static void composite_close(int sub_api, struct libusb_de vice_handle *dev_handle
23 usb_api_backend[USB_API_WINUSBX].close(i, dev_handle);
24 }
25 }
26 +
27 + if (has_hid) {
28 + usb_api_backend[USB_API_HID].close(sub_api, dev_handle);
29 + }
30 }
31
32 static int composite_claim_interface(int sub_api, struct libusb_device_handle * dev_handle, int iface)
OLDNEW
« no previous file with comments | « third_party/libusb/README.chromium ('k') | third_party/libusb/src/libusb/os/windows_usb.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698