Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[net-next-2.6.git] / drivers / net / wireless / wl12xx / wl1251_boot.c

diff --git a/drivers/net/wireless/wl12xx/wl1251_boot.c b/drivers/net/wireless/wl12xx/wl1251_boot.c
index d5ac79aeaa735cecdca705f6e556b774807c69c6..2545123931e85357e152f9ffc6dfc35a8834e873 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1251_boot.c
+++ b/drivers/net/wireless/wl12xx/wl1251_boot.c
@@ -497,7 +497,8 @@ int wl1251_boot(struct wl1251 *wl)
        /* 2. start processing NVS file */
        if (wl->use_eeprom) {
                wl1251_reg_write32(wl, ACX_REG_EE_START, START_EEPROM_MGR);
-               msleep(4000);
+               /* Wait for EEPROM NVS burst read to complete */
+               msleep(40);
                wl1251_reg_write32(wl, ACX_EEPROMLESS_IND_REG, USE_EEPROM);
        } else {
                ret = wl1251_boot_upload_nvs(wl);