diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-10-22 20:12:52 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-10-22 20:12:52 +0200 |
commit | 119a749db9c9847e0766860c17109b0f0b6bf349 (patch) | |
tree | 4cdbfcad285124c1abf7b3c1c94666cef55767ce /gnu/packages/patches/libusb-for-axoloti.patch | |
parent | 530d9e1555e8d0125dde6893f5f70c7a1ebc2564 (diff) | |
parent | 25669275a1a570cc266128274cb27a22f6a3a318 (diff) | |
download | guix-119a749db9c9847e0766860c17109b0f0b6bf349.tar guix-119a749db9c9847e0766860c17109b0f0b6bf349.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/libusb-for-axoloti.patch')
-rw-r--r-- | gnu/packages/patches/libusb-for-axoloti.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/gnu/packages/patches/libusb-for-axoloti.patch b/gnu/packages/patches/libusb-for-axoloti.patch new file mode 100644 index 0000000000..2c07d767d9 --- /dev/null +++ b/gnu/packages/patches/libusb-for-axoloti.patch @@ -0,0 +1,14 @@ +diff -rp -u4 libusb-1.0.19-orig/libusb/descriptor.c libusb-1.0.19/libusb/descriptor.c +--- libusb-1.0.19-orig/libusb/descriptor.c 2015-05-12 00:15:19 +0200 ++++ libusb-1.0.19/libusb/descriptor.c 2015-05-12 00:17:09 +0200 +@@ -1181,9 +1181,9 @@ int API_EXPORTED libusb_get_string_descr + if (tbuf[1] != LIBUSB_DT_STRING) + return LIBUSB_ERROR_IO; + + if (tbuf[0] > r) +- return LIBUSB_ERROR_IO; ++ tbuf[0] = r; + + for (di = 0, si = 2; si < tbuf[0]; si += 2) { + if (di >= (length - 1)) + break; |