@@ -4343,11 +4343,10 @@
 		*ids_found = num_ids;
 
 		return(identities);
 	}
 
-
 	*ids_found = 0;
 	return(NULL);
 }
 
 static cackey_ret cackey_get_pin(char *pinbuf) {
@@ -4745,13 +4744,11 @@
 
 	/* Determine list of readers */
 	pcsc_connect_ret = cackey_pcsc_connect();
 /* XXX: CAN HANG HERE ! */
 	if (pcsc_connect_ret != CACKEY_PCSC_S_OK) {
-		CACKEY_DEBUG_PRINTF("Connection to PC/SC failed, assuming no slots");
-
-		slot_count = 0;
+		CACKEY_DEBUG_PRINTF("Connection to PC/SC failed, assuming no hardware slots");
 	} else {
 		pcsc_readers_len = 0;
 
 		scard_listreaders_ret = SCardListReaders(*cackey_pcsc_handle, NULL, NULL, &pcsc_readers_len);
 
@@ -4774,11 +4771,10 @@
 				pcsc_readers_e = pcsc_readers + pcsc_readers_len;
 
 				/* Start with Slot ID 1, to avoid a bug in GDM on RHEL */
 				/* Bug 594911: https://bugzilla.redhat.com/show_bug.cgi?id=594911 */
 				currslot = 1;
-				slot_count = 0;
 				while (pcsc_readers < pcsc_readers_e) {
 					/* Find next available slot */
 					for (; currslot < (sizeof(cackey_slots) / sizeof(cackey_slots[0])); currslot++) {
 						if (!cackey_slots[currslot].active) {
 							break;
@@ -4862,27 +4858,27 @@
 					}
 					currslot++;
 
 					pcsc_readers += curr_reader_len + 1;
 				}
-
-				for (currslot = 0; currslot < (sizeof(cackey_slots) / sizeof(cackey_slots[0])); currslot++) {
-					if (cackey_slots[currslot].active) {
-						CACKEY_DEBUG_PRINTF("Found active slot %lu, reader = %s", (unsigned long) currslot, cackey_slots[currslot].pcsc_reader);
-
-						slot_count++;
-					}
-				}
 			} else {
 				CACKEY_DEBUG_PRINTF("Second call to SCardListReaders failed, return %s/%li", CACKEY_DEBUG_FUNC_SCARDERR_TO_STR(scard_listreaders_ret), (long) scard_listreaders_ret);
 			}
 
 			free(pcsc_readers_s);
 		} else {
 			CACKEY_DEBUG_PRINTF("First call to SCardListReaders failed, return %s/%li", CACKEY_DEBUG_FUNC_SCARDERR_TO_STR(scard_listreaders_ret), (long) scard_listreaders_ret);
 		}
 	}
+
+	for (currslot = 0; currslot < (sizeof(cackey_slots) / sizeof(cackey_slots[0])); currslot++) {
+		if (cackey_slots[currslot].active) {
+			CACKEY_DEBUG_PRINTF("Found active slot %lu, reader = %s", (unsigned long) currslot, cackey_slots[currslot].pcsc_reader);
+
+			slot_count++;
+		}
+	}
 
 	mutex_retval = cackey_mutex_unlock(cackey_biglock);
 	if (mutex_retval != 0) {
 		CACKEY_DEBUG_PRINTF("Error.  Unlocking failed.");