From: Dan Williams Date: Fri, 23 Jan 2009 16:55:33 +0000 (-0500) Subject: libertas: fix CF firmware loading for some cards X-Git-Tag: MMI-PSA29.97-13-9~29230^2~836^2~45 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1fac36ee7d5a0611e1216b02b485b154c8aa6dad;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Tested-by: Ryan Mallon Acked-by: Ryan Mallon Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c index 842a08d1f106..8f8934a5ba3a 100644 --- a/drivers/net/wireless/libertas/if_cs.c +++ b/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;