From 5463c2ef46e068b05fcb9f9e555d8866e07f01df Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Thu, 15 Apr 2010 13:32:58 -0700
Subject: [PATCH] --- yaml --- r: 194355 b: refs/heads/master c:
 ac1a474d71d6cbf94bf26889da5768f5f2b0ca2b h: refs/heads/master i:   194353:
 4bac2a82b8f17864ce92bbbaab203bc0cdd026a1   194351:
 b25a8ac2d3add8b2beccf413a85efb42def8c1c9 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/libertas/if_sdio.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3ab13de59a6e..f99313ab305b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96021f096e5178582af296a2fbb6df7dbd6b695c
+refs/heads/master: ac1a474d71d6cbf94bf26889da5768f5f2b0ca2b
diff --git a/trunk/drivers/net/wireless/libertas/if_sdio.c b/trunk/drivers/net/wireless/libertas/if_sdio.c
index 60dc9b64381d..68cc407054e3 100644
--- a/trunk/drivers/net/wireless/libertas/if_sdio.c
+++ b/trunk/drivers/net/wireless/libertas/if_sdio.c
@@ -499,6 +499,11 @@ static int if_sdio_prog_helper(struct if_sdio_card *card)
 		if (ret)
 			goto release;
 
+		/* On some platforms (like Davinci) the chip needs more time
+		 * between helper blocks.
+		 */
+		mdelay(2);
+
 		chunk_size = min(size, (size_t)60);
 
 		*((__le32*)chunk_buffer) = cpu_to_le32(chunk_size);