[git] GnuPG - branch, master, updated. gnupg-2.1.11-159-gcb4fee8

[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, master has been updated
       via  cb4fee8bb645745ff199f7428e19226d5bc63dab (commit)
      from  508b0deb70d39d388149be9a63fab24cc956a239 (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 cb4fee8bb645745ff199f7428e19226d5bc63dab
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Apr 28 12:43:48 2016 +0900

    scd: Fix error return path.
    
    * scd/ccid-driver.c (bulk_in): Remove EAGAIN handling.
    Handle LIBUSB_ERROR_NO_DEVICE to return CCID_DRIVER_ERR_NO_READER.
    
    --
    
    GnuPG-bug-id: 2306
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 601681f..985404f 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -1976,11 +1976,12 @@ bulk_in (ccid_driver_t handle, unsigned char *buffer, size_t length,
       if (rc < 0)
         {
           DEBUGOUT_1 ("usb_bulk_read error: %s\n", libusb_error_name (rc));
-          if (rc == EAGAIN && eagain_retries++ < 3)
+          if (rc == LIBUSB_ERROR_NO_DEVICE)
             {
-              my_sleep (1);
-              goto retry;
+              handle->enodev_seen = 1;
+              return CCID_DRIVER_ERR_NO_READER;
             }
+
           return CCID_DRIVER_ERR_CARD_IO_ERROR;
         }
       if (msglen < 0)

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

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


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