diff --git a/src/pkcs15init/pkcs15-lib.c b/src/pkcs15init/pkcs15-lib.c
index cac31530..6096b9db 100644
--- a/src/pkcs15init/pkcs15-lib.c
+++ b/src/pkcs15init/pkcs15-lib.c
@@ -777,8 +777,7 @@ check_key_compatibility(struct sc_pkcs15_card *p15card,
 	unsigned int count;
 
 	count = p15card->card->algorithm_count;
-	info = p15card->card->algorithms;
-	while (count--) {
+	for (info = p15card->card->algorithms; count--; info++) {
 		/* XXX: check for equality, or <= ? */
 		if (info->algorithm != key->algorithm
 		 || info->key_length != key_length)