[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.12-8-g9dc76d5

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, STABLE-BRANCH-2-2 has been updated
       via  9dc76d599cd4c86d3c187d078daad1144a92564c (commit)
      from  80a08b655f8f5e7a7d78b766f1770fd474081a48 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9dc76d599cd4c86d3c187d078daad1144a92564c
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Jan 7 14:08:51 2019 +0900

    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 <gniibe at fsij.org>

diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 6b0833b..5bab0b1 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;
 

-----------------------------------------------------------------------

Summary of changes:
 scd/ccid-driver.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org