Index: opensc-0.11.13/src/libopensc/card-belpic.c
===================================================================
--- opensc-0.11.13.orig/src/libopensc/card-belpic.c	2010-02-16 10:03:28.000000000 +0100
+++ opensc-0.11.13/src/libopensc/card-belpic.c	2010-04-13 16:29:22.000000000 +0200
@@ -1338,7 +1338,7 @@ static int belpic_pin_cmd_usage(sc_card_
 	data->pin1.encoding = data->pin2.encoding = BELPIC_PIN_ENCODING;
 	data->pin1.pad_char = data->pin2.pad_char = BELPIC_PAD_CHAR;
 	data->pin1.min_length = data->pin2.min_length = BELPIC_MIN_USER_PIN_LEN;
-	data->pin1.max_length = data->pin1.max_length = BELPIC_MAX_USER_PIN_LEN;
+	data->pin1.max_length = data->pin2.max_length = BELPIC_MAX_USER_PIN_LEN;
 	data->apdu = NULL;
 
 	return iso_ops->pin_cmd(card, data, tries_left);
Index: opensc-0.11.13/src/libopensc/log.h
===================================================================
--- opensc-0.11.13.orig/src/libopensc/log.h	2010-02-16 10:03:28.000000000 +0100
+++ opensc-0.11.13/src/libopensc/log.h	2010-04-13 16:30:36.000000000 +0200
@@ -74,8 +74,8 @@ void sc_hex_dump(struct sc_context *ctx,
 	int _ret = (r); \
 	if (_ret < 0) { \
 		sc_do_log(ctx, SC_LOG_TYPE_ERROR, __FILE__, __LINE__, __FUNCTION__, "%s: %s\n", (text), sc_strerror(_ret)); \
-		return _ret; \
 	} \
+	return _ret; \
 } while(0)
 
 #define sc_perror(ctx, errno, str) { \