aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2005-05-07 15:22:01 +0000
committerWerner Koch <[email protected]>2005-05-07 15:22:01 +0000
commit0ab01480edb9d1b0da55e153b58e131ec3d9b7c9 (patch)
treefc3b13e4c712900436ad7fee9d7e2479fd7fd3ba
parent* main.h, keygen.c (parse_expire_string, ask_expire_interval), sign.c (diff)
downloadgnupg-0ab01480edb9d1b0da55e153b58e131ec3d9b7c9.tar.gz
gnupg-0ab01480edb9d1b0da55e153b58e131ec3d9b7c9.zip
(do_close_reader): Don't do a reset before close.
Some folks reported that it makes the SCR335 hang less often. Look at the source on how to re-enable it.
Diffstat (limited to '')
-rw-r--r--g10/ChangeLog6
-rw-r--r--g10/ccid-driver.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index ccff025ff..04bac2be0 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-07 Werner Koch <[email protected]>
+
+ * ccid-driver.c (do_close_reader): Don't do a reset before close.
+ Some folks reported that it makes the SCR335 hang less often.
+ Look at the source on how to re-enable it.
+
2005-05-06 David Shaw <[email protected]>
* main.h, keygen.c (parse_expire_string, ask_expire_interval),
diff --git a/g10/ccid-driver.c b/g10/ccid-driver.c
index 9fd983fe4..b817452b1 100644
--- a/g10/ccid-driver.c
+++ b/g10/ccid-driver.c
@@ -986,7 +986,8 @@ do_close_reader (ccid_driver_t handle)
}
if (handle->idev)
{
- usb_reset (handle->idev);
+ if (getenv ("GNUPG_CCID_DRIVER_RESET_BEFORE_CLOSE"))
+ usb_reset (handle->idev);
usb_release_interface (handle->idev, handle->ifc_no);
usb_close (handle->idev);
handle->idev = NULL;