Commit ca962557 authored Apr 28, 2010 by Dan Williams Committed by John W. Linville Apr 28, 2010

libertas: fix 8686 firmware loading regression



The 'ready' condition was incorrectly evaluated which sometimes lead to
failures loading the second-stage firmware on 8686 devices.

(This was introduced in "libertas: consolidate SDIO firmware wait code".
-- JWL)

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 446cfaa4

drivers/net/wireless/libertas/if_sdio.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -323,7 +323,9 @@ static int if_sdio_wait_status(struct if_sdio_card *card, const u8 condition)
		timeout = jiffies + HZ;
		while (1) {
		status = sdio_readb(card->func, IF_SDIO_STATUS, &ret);
		if (ret \|\| (status & condition))
		if (ret)
		return ret;
		if ((status & condition) == condition)
		break;
		if (time_after(jiffies, timeout))
		return -ETIMEDOUT;