diff --git a/[refs] b/[refs]
index c132c2184e22..5ebe902fd49e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f380f2c4a12e913356bd49f8790ec1063c4fe9f8
+refs/heads/master: 885ba1da689299ec52e646ca1a2429b8de55f364
diff --git a/trunk/drivers/nfc/pn544_hci.c b/trunk/drivers/nfc/pn544_hci.c
index 46f4a9f9f5e4..281f18c2fb82 100644
--- a/trunk/drivers/nfc/pn544_hci.c
+++ b/trunk/drivers/nfc/pn544_hci.c
@@ -232,7 +232,7 @@ static int pn544_hci_i2c_write(struct i2c_client *client, u8 *buf, int len)
 
 static int check_crc(u8 *buf, int buflen)
 {
-	u8 len;
+	int len;
 	u16 crc;
 
 	len = buf[0] + 1;