From: Holger Schurig Date: Tue, 9 Oct 2007 08:41:57 +0000 (+0200) Subject: libertas: fixes for slow hardware X-Git-Tag: v2.6.24-rc3~163^2~27 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4ef31702c1a83a380d5e144f5af55e21f59c9bb6;p=~shefty%2Frdma-dev.git libertas: fixes for slow hardware Fixes for slow hardware. Signed-off-by: Vitaly V. Bursov Signed-off-by: Holger Schurig 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 0360cad363a..ec89dabc412 100644 --- a/drivers/net/wireless/libertas/if_cs.c +++ b/drivers/net/wireless/libertas/if_cs.c @@ -148,11 +148,11 @@ static int if_cs_poll_while_fw_download(struct if_cs_card *card, uint addr, u8 r { int i; - for (i = 0; i < 500; i++) { + for (i = 0; i < 1000; i++) { u8 val = if_cs_read8(card, addr); if (val == reg) return i; - udelay(100); + udelay(500); } return -ETIME; } @@ -878,6 +878,9 @@ static int if_cs_probe(struct pcmcia_device *p_dev) 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); /* And finally bring the card up */