summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTormod Volden <debian.tormod@gmail.com>2021-12-01 11:38:49 +0100
committerNathan Hjelm <hjelmn@google.com>2021-12-01 09:43:27 -0700
commitf2b218b61867f27568ba74fa38e156e5f55ed825 (patch)
tree99c4a7ce90dcede9aa352657897e3a9d779bb0c6
parentb4b4138a31b2548681ad8af29758e6767c75ae7b (diff)
downloadlibusb-f2b218b61867f27568ba74fa38e156e5f55ed825.tar.gz
darwin: Minor tidy up in darwin_set_interface_altsetting()
Closes #1032 Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
-rw-r--r--libusb/os/darwin_usb.c6
-rw-r--r--libusb/version_nano.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/libusb/os/darwin_usb.c b/libusb/os/darwin_usb.c
index 5f2fa3c..c64ecd1 100644
--- a/libusb/os/darwin_usb.c
+++ b/libusb/os/darwin_usb.c
@@ -1633,12 +1633,12 @@ static int darwin_set_interface_altsetting(struct libusb_device_handle *dev_hand
}
return ret;
}
- else
- usbi_warn (HANDLE_CTX (dev_handle), "SetAlternateInterface: %s", darwin_error_str(kresult));
+
+ usbi_warn (HANDLE_CTX (dev_handle), "SetAlternateInterface: %s", darwin_error_str(kresult));
ret = darwin_to_libusb(kresult);
if (ret != LIBUSB_ERROR_PIPE) {
- return darwin_to_libusb (kresult);
+ return ret;
}
/* If a device only supports a default setting for the specified interface, then a STALL
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 09bf359..b129143 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11680
+#define LIBUSB_NANO 11681