diff --git a/src/libopensc/pkcs15-cache.c b/src/libopensc/pkcs15-cache.c
index 4ceab2b8..25e2de69 100644
--- a/src/libopensc/pkcs15-cache.c
+++ b/src/libopensc/pkcs15-cache.c
@@ -123,7 +123,7 @@ int sc_pkcs15_read_cached_file(struct sc_pkcs15_card *p15card,
 	*bufsize = count;
 	if (data)
 		*buf = data;
-        return 0;
+	return 0;
 }
 
 int sc_pkcs15_cache_file(struct sc_pkcs15_card *p15card,
diff --git a/src/libopensc/pkcs15.c b/src/libopensc/pkcs15.c
index abad78b3..b7086afd 100644
--- a/src/libopensc/pkcs15.c
+++ b/src/libopensc/pkcs15.c
@@ -1519,7 +1519,7 @@ int sc_pkcs15_read_file(struct sc_pkcs15_card *p15card,
 	sc_path_t tmp_path, *path = &tmp_path;
 	u8	*data = NULL;
 	size_t	len = 0, offset = 0;
-	int	r = -1;
+	int	r;
 
 	assert(p15card != NULL && in_path != NULL && buf != NULL);
 
@@ -1543,7 +1543,7 @@ int sc_pkcs15_read_file(struct sc_pkcs15_card *p15card,
 	} else {
 		memcpy(path, in_path, sizeof(sc_path_t));
 	}
-	
+	r = -1; /* file state: not in cache */
 	if (p15card->opts.use_cache) {
 		r = sc_pkcs15_read_cached_file(p15card, path, &data, &len);
 	}