diff options
author | Marius Bakke <mbakke@fastmail.com> | 2018-03-29 17:34:41 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2018-03-29 17:34:41 +0200 |
commit | 5576cfabf3485e0cf794cc3de085a3578151ee64 (patch) | |
tree | 8ca4093d05fda6b0064d0fca429353327ec491f9 /gnu/packages/patches/libusb-for-axoloti.patch | |
parent | 12cb6c31df4b90d58658e88a256e36b6808e1064 (diff) | |
parent | e086d2f68b90a39bae07ae46572e5cc6b0fc4308 (diff) | |
download | guix-patches-5576cfabf3485e0cf794cc3de085a3578151ee64.tar guix-patches-5576cfabf3485e0cf794cc3de085a3578151ee64.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, 7 insertions, 7 deletions
diff --git a/gnu/packages/patches/libusb-for-axoloti.patch b/gnu/packages/patches/libusb-for-axoloti.patch index 2c07d767d9..76a45e801d 100644 --- a/gnu/packages/patches/libusb-for-axoloti.patch +++ b/gnu/packages/patches/libusb-for-axoloti.patch @@ -1,14 +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 +diff -rpu4 libusb-1.0.22.orig/libusb/descriptor.c libusb-1.0.22/libusb/descriptor.c +--- libusb-1.0.22.orig/libusb/descriptor.c 2018-03-17 08:23:37.000000000 +0100 ++++ libusb-1.0.22/libusb/descriptor.c 2018-03-29 10:36:09.968429473 +0200 +@@ -1173,9 +1173,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; ++ tbuf[0] = r; - for (di = 0, si = 2; si < tbuf[0]; si += 2) { + di = 0; + for (si = 2; si < tbuf[0]; si += 2) { if (di >= (length - 1)) - break; |