diff --git a/[refs] b/[refs]
index 29c38f7a99c0..e438b8abcd30 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0712612741e1dccf10353c70ebe90ba8cc60d5fb
+refs/heads/master: 1fac36ee7d5a0611e1216b02b485b154c8aa6dad
diff --git a/trunk/drivers/net/wireless/libertas/if_cs.c b/trunk/drivers/net/wireless/libertas/if_cs.c
index 842a08d1f106..8f8934a5ba3a 100644
--- a/trunk/drivers/net/wireless/libertas/if_cs.c
+++ b/trunk/drivers/net/wireless/libertas/if_cs.c
@@ -151,7 +151,7 @@ static int if_cs_poll_while_fw_download(struct if_cs_card *card, uint addr, u8 r
 	for (i = 0; i < 100000; i++) {
 		u8 val = if_cs_read8(card, addr);
 		if (val == reg)
-			return i;
+			return 0;
 		udelay(5);
 	}
 	return -ETIME;