瀏覽代碼

libertas: fix CF firmware loading for some cards

if_cs_poll_while_fw_download() returned the number of iterations
remaining on success, which in turn got returned as the value from
if_cs_prog_real() and if_cs_prog_helper().  But since if_cs_probe()
interprets non-zero return values from firmware load functions as an
error, this sometimes caused spurious firmware load failures.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Tested-by: Ryan Mallon <ryan@bluewatersys.com>
Acked-by: Ryan Mallon <ryan@bluewatersys.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Dan Williams 16 年之前
父節點
當前提交
1fac36ee7d
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      drivers/net/wireless/libertas/if_cs.c

+ 1 - 1
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++) {
 	for (i = 0; i < 100000; i++) {
 		u8 val = if_cs_read8(card, addr);
 		u8 val = if_cs_read8(card, addr);
 		if (val == reg)
 		if (val == reg)
-			return i;
+			return 0;
 		udelay(5);
 		udelay(5);
 	}
 	}
 	return -ETIME;
 	return -ETIME;