From: zzc <zzc@rock-chips.com>
Date: Mon, 17 Oct 2016 03:54:22 +0000 (+0800)
Subject: net: rkwifi: fix ap6330 sdio write/read abnormal when doing stress test
X-Git-Tag: firefly_0821_release~1391
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9be9e8f5f3abfe87c5ac7fe32b19e45f84782efe;p=firefly-linux-kernel-4.4.55.git

net: rkwifi: fix ap6330 sdio write/read abnormal when doing stress test

Change-Id: I7c353cd4cabb24425aa0bdef243adb293e7c2829
Signed-off-by: zzc <zzc@rock-chips.com>
---

diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_sdio.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_sdio.c
index 89344d5e4232..e7fea6764560 100755
--- a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_sdio.c
+++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_sdio.c
@@ -5353,6 +5353,10 @@ dhd_bus_init(dhd_pub_t *dhdp, bool enforce_mutex)
 
 
 	else {
+		if (dhdp->conf->chip == BCM4354_CHIP_ID) {
+			ret = -1;
+			goto exit;
+		}
 		/* Disable F2 again */
 		enable = SDIO_FUNC_ENABLE_1;
 		bcmsdh_cfg_write(bus->sdh, SDIO_FUNC_0, SDIOD_CCCR_IOEN, enable, NULL);