[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.5-15-gfd23a05

[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  fd23a0524d8060ed12d87c679b7823686614aaee (commit)
      from  c84bae69e9e02923f7180e09d161cb0b13257436 (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 fd23a0524d8060ed12d87c679b7823686614aaee
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Mar 15 23:59:22 2018 +0900

    scd: Fix suspend/resume handling for CCID driver.
    
    * scd/ccid-driver.c (intr_cb): Try submitting INTERRUPT urb
    to see if it's suspend/resume.
    
    --
    
    Upon suspend/resume, LIBUSB_TRANSFER_NO_DEVICE is returned, since all
    URBs are cancelled.  We need to see if it's real NODEV error or its by
    suspend/resume.  We can distinguish by sending URB again.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 5046da5..f33a36c 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -1467,7 +1467,8 @@ intr_cb (struct libusb_transfer *transfer)
 
   DEBUGOUT_1 ("CCID: interrupt callback %d\n", transfer->status);
 
-  if (transfer->status == LIBUSB_TRANSFER_TIMED_OUT)
+  if (transfer->status == LIBUSB_TRANSFER_TIMED_OUT
+      || transfer->status == LIBUSB_TRANSFER_NO_DEVICE)
     {
       int err;
 

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

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


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