Commit 4ef31702 authored by Holger Schurig's avatar Holger Schurig Committed by Jeff Garzik

libertas: fixes for slow hardware

Fixes for slow hardware.
Signed-off-by: default avatarVitaly V. Bursov <vitalyvb@ukr.net>
Signed-off-by: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0f39c4ab
...@@ -148,11 +148,11 @@ static int if_cs_poll_while_fw_download(struct if_cs_card *card, uint addr, u8 r ...@@ -148,11 +148,11 @@ static int if_cs_poll_while_fw_download(struct if_cs_card *card, uint addr, u8 r
{ {
int i; int i;
for (i = 0; i < 500; i++) { for (i = 0; i < 1000; i++) {
u8 val = if_cs_read8(card, addr); u8 val = if_cs_read8(card, addr);
if (val == reg) if (val == reg)
return i; return i;
udelay(100); udelay(500);
} }
return -ETIME; return -ETIME;
} }
...@@ -878,6 +878,9 @@ static int if_cs_probe(struct pcmcia_device *p_dev) ...@@ -878,6 +878,9 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
goto out3; goto out3;
} }
/* Clear any interrupt cause that happend while sending
* firmware/initializing card */
if_cs_write16(card, IF_CS_C_INT_CAUSE, IF_CS_C_IC_MASK);
if_cs_enable_ints(card); if_cs_enable_ints(card);
/* And finally bring the card up */ /* And finally bring the card up */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment