net: wireless: bcm4329: Fix setting HT clock race conditions in driver start

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

diff --git a/drivers/net/wireless/bcm4329/dhd_sdio.c b/drivers/net/wireless/bcm4329/dhd_sdio.c
index 176d6e8..ff1bded 100644 (file)
--- a/drivers/net/wireless/bcm4329/dhd_sdio.c
+++ b/drivers/net/wireless/bcm4329/dhd_sdio.c
@@ -5831,6 +5831,8 @@ dhd_bus_devreset(dhd_pub_t *dhdp, uint8 flag)
 
                if (bus->dhd->dongle_reset) {
                        /* Turn on WLAN */
+                       dhd_os_sdlock(dhdp);
+
                        /* Reset SD client */
                        bcmsdh_reset(bus->sdh);
 
@@ -5862,6 +5864,7 @@ dhd_bus_devreset(dhd_pub_t *dhdp, uint8 flag)
                                        bcmerror = BCME_SDIO_ERROR;
                        } else
                                bcmerror = BCME_SDIO_ERROR;
+                       dhd_os_sdunlock(dhdp);
                } else {
                        bcmerror = BCME_NOTDOWN;
                        DHD_ERROR(("%s: Set DEVRESET=FALSE invoked when device is on\n",