aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2019-01-07 05:08:51 +0000
committerNIIBE Yutaka <[email protected]>2019-01-16 23:13:17 +0000
commit9dc76d599cd4c86d3c187d078daad1144a92564c (patch)
tree5d8631462d95d8314d68ec39e32242859da48b72
parentagent: Fix message for ACK button. (diff)
downloadgnupg-9dc76d599cd4c86d3c187d078daad1144a92564c.tar.gz
gnupg-9dc76d599cd4c86d3c187d078daad1144a92564c.zip
scd: Fix for USB INTERRUPT transfer.
* scd/ccid-driver.c (intr_cb): When LIBUSB_TRANSFER_NO_DEVICE, just handle this event as failure. -- Cherry-picked from master commit: 5ab3bc422a5cc1a646c168b547f2b6538b3a4ffa It used to try another interrupt transfer request to make sure if it fails again. GnuPG-bug-id: 4308 Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to '')
-rw-r--r--scd/ccid-driver.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 6b0833b2c..5bab0b176 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -1470,8 +1470,7 @@ intr_cb (struct libusb_transfer *transfer)
DEBUGOUT_1 ("CCID: interrupt callback %d\n", transfer->status);
- if (transfer->status == LIBUSB_TRANSFER_TIMED_OUT
- || transfer->status == LIBUSB_TRANSFER_NO_DEVICE)
+ if (transfer->status == LIBUSB_TRANSFER_TIMED_OUT)
{
int err;