Changeset 1113 for trunk/src

Timestamp:

01/03/09 11:11:53 (3 years ago)

Author:

alonbl

Message:

Handle no card error from get slot status

File:

• trunk/src/ifd/ifd-ccid.c (modified) (2 diffs)

trunk/src/ifd/ifd-ccid.c

@@ -887 +887 @@
                 }
         }
+
         r = ccid_prepare_cmd(reader, cmdbuf, 10, 0, CCID_CMD_GETSLOTSTAT,
                              NULL, NULL, 0);
@@ -892 +893 @@
                 return r;
         r = ccid_command(reader, cmdbuf, 10, ret, 10);
-        if (r < 0)
+        if (r == IFD_ERROR_NO_CARD) {
+                stat = 0;
+        }
+        else if (r < 0) {
                 return r;
-        switch (ret[7] & 3) {
-        case 2:
-                stat = 0;
-                break;
-        default:
-                stat = IFD_CARD_PRESENT;
-        }
+        }
+        else {
+                switch (ret[7] & 3) {
+                case 2:
+                        stat = 0;
+                        break;
+                default:
+                        stat = IFD_CARD_PRESENT;
+                        break;
+                }
+        }
+
         ifd_debug(1, "probed result: %d", IFD_CARD_STATUS_CHANGED | stat);