summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--third_party/libusb/README.chromium1
-rw-r--r--third_party/libusb/src/libusb/os/darwin_usb.c2
-rw-r--r--third_party/libusb/upstream-tick147.patch13
3 files changed, 15 insertions, 1 deletions
diff --git a/third_party/libusb/README.chromium b/third_party/libusb/README.chromium
index 134cbed..fd52246 100644
--- a/third_party/libusb/README.chromium
+++ b/third_party/libusb/README.chromium
@@ -16,3 +16,4 @@ Local Modifications:
libusb_handle_event.
- windows-build.patch has been applied.
- darwin-sigfpe.patch has been applied.
+- upstream-tick147.patch has been applied.
diff --git a/third_party/libusb/src/libusb/os/darwin_usb.c b/third_party/libusb/src/libusb/os/darwin_usb.c
index 58467c3..07d6d61 100644
--- a/third_party/libusb/src/libusb/os/darwin_usb.c
+++ b/third_party/libusb/src/libusb/os/darwin_usb.c
@@ -1268,7 +1268,7 @@ static int darwin_release_interface(struct libusb_device_handle *dev_handle, int
if (kresult != kIOReturnSuccess)
usbi_warn (HANDLE_CTX (dev_handle), "Release: %s", darwin_error_str(kresult));
- cInterface->interface = IO_OBJECT_NULL;
+ cInterface->interface = NULL;
return darwin_to_libusb (kresult);
}
diff --git a/third_party/libusb/upstream-tick147.patch b/third_party/libusb/upstream-tick147.patch
new file mode 100644
index 0000000..28acfc6
--- /dev/null
+++ b/third_party/libusb/upstream-tick147.patch
@@ -0,0 +1,13 @@
+diff --git a/third_party/libusb/src/libusb/os/darwin_usb.c b/third_party/libusb/src/libusb/os/darwin_usb.c
+index 58467c3..07d6d61 100644
+--- a/third_party/libusb/src/libusb/os/darwin_usb.c
++++ b/third_party/libusb/src/libusb/os/darwin_usb.c
+@@ -1268,7 +1268,7 @@ static int darwin_release_interface(struct libusb_device_handle *dev_handle, int
+ if (kresult != kIOReturnSuccess)
+ usbi_warn (HANDLE_CTX (dev_handle), "Release: %s", darwin_error_str(kresult));
+
+- cInterface->interface = IO_OBJECT_NULL;
++ cInterface->interface = NULL;
+
+ return darwin_to_libusb (kresult);
+ }