diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-03-30 21:30:45 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-03-30 21:30:45 +0200 |
| commit | ee770c2346eb37e0dcb8b6cf3eaacf3d8efd6bbc (patch) | |
| tree | 58f05092be1a17a939e861f8cadcda1b6ca2ecef /debian/patches/0130-usb-timeout.patch | |
| parent | 0da9e21872802cfc6e975b1ebaf9efb9e5934d84 (diff) | |
| parent | fef76e17ed4c607ea73b81279f9ef1d7121be900 (diff) | |
Merge branch 'release/experimental/1.0.29-1_experimental1'experimental/1.0.29-1_experimental1
Diffstat (limited to 'debian/patches/0130-usb-timeout.patch')
| -rw-r--r-- | debian/patches/0130-usb-timeout.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/debian/patches/0130-usb-timeout.patch b/debian/patches/0130-usb-timeout.patch deleted file mode 100644 index 284d3cf..0000000 --- a/debian/patches/0130-usb-timeout.patch +++ /dev/null @@ -1,30 +0,0 @@ -Description: Add timeout before usb bulk write -Author: Steve Graham <bugs@annaghvarn.plus.com> -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=810919 -Forwarded: https://alioth.debian.org/tracker/index.php?func=detail&aid=315288&group_id=30186&atid=410366 -Last-Update: 2016-01-25 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/sanei/sanei_usb.c -=================================================================== ---- trunk.orig/sanei/sanei_usb.c -+++ trunk/sanei/sanei_usb.c -@@ -2411,6 +2411,10 @@ SANE_Status - sanei_usb_write_bulk (SANE_Int dn, const SANE_Byte * buffer, size_t * size) - { - ssize_t write_size = 0; -+ struct timespec sleepytime, sleepyremain; -+ -+ sleepytime.tv_nsec = 50000L; /* nanoseconds */ -+ sleepytime.tv_sec = 0; - - if (!size) - { -@@ -2439,6 +2443,7 @@ sanei_usb_write_bulk (SANE_Int dn, const - else if (devices[dn].method == sanei_usb_method_libusb) - #ifdef HAVE_LIBUSB - { -+ nanosleep(&sleepytime, &sleepyremain); /* sg */ - if (devices[dn].bulk_out_ep) - { - write_size = usb_bulk_write (devices[dn].libusb_handle, |