deon/gnuk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Really fix the last race condition.

Browse Source 
Fixes the commit of fc36773.
This commit is contained in:
NIIBE Yutaka
2018-12-06 12:09:42 +09:00
parent c17fd5401b
commit 8d15086d06
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@@ -1,3 +1,9 @@
2018-12-06 NIIBE Yutaka <gniibe@fsij.org>
* src/usb-ccid.c (ccid_thread): Priority of handling
EV_TX_FINISHED is most important. Don't handle
Ack button event when c->tx_busy = 1.
2018-12-05 NIIBE Yutaka <gniibe@fsij.org> 2018-12-05 NIIBE Yutaka <gniibe@fsij.org>
* src/openpgp.c (cmd_external_authenticate): Support * src/openpgp.c (cmd_external_authenticate): Support
@@ -7,10 +13,6 @@
* src/openpgp-do.c (gpg_data_copy): Fix for NR_DO_UIF_SIG. * src/openpgp-do.c (gpg_data_copy): Fix for NR_DO_UIF_SIG.
2018-11-30 NIIBE Yutaka <gniibe@fsij.org>
* src/usb-ccid.c (ccid_thread): Fix another race condition.
2018-11-25 NIIBE Yutaka <gniibe@fsij.org> 2018-11-25 NIIBE Yutaka <gniibe@fsij.org>
* VERSION: 1.2.12. * VERSION: 1.2.12.

2
src/usb-ccid.c
View File

@@ -1800,7 +1800,7 @@ ccid_thread (void *arg)
} }
#ifdef ACKBTN_SUPPORT #ifdef ACKBTN_SUPPORT
if (c->tx_busy && ack_intr.ready) if (!c->tx_busy && ack_intr.ready)
{ {
ackbtn_disable (); ackbtn_disable ();
chopstx_intr_done (&ack_intr); chopstx_intr_done (&ack_intr);