aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c
diff options
context:
space:
mode:
authorGreg Goldman <ggoldman@broadcom.com>2013-02-04 17:22:52 -0800
committerZiyan <jaraidaniel@gmail.com>2016-05-01 23:35:13 +0200
commitea65f9349bbbff1d0762293e08c4adf4b78a8cc3 (patch)
tree66f5847eb6673c7332c8bfb5cb37fbc46d7d65e7 /drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c
parentffe8f8f92f172624b89ee43dff63bca88b95a9e3 (diff)
downloadkernel_samsung_tuna-ea65f9349bbbff1d0762293e08c4adf4b78a8cc3.zip
kernel_samsung_tuna-ea65f9349bbbff1d0762293e08c4adf4b78a8cc3.tar.gz
kernel_samsung_tuna-ea65f9349bbbff1d0762293e08c4adf4b78a8cc3.tar.bz2
net: wireless: bcmdhd: Update to Version 1.28-27
- Disable SDIO in-band interrupt explicitly to avoid problems with SDIO Host when generating SDIO Interrupt on DAT1 created unwanted CRC error - Fix handling when bcmsdh_probe() called twice - Fix handling the packet list properly in the corner cases - Remove unnecessary delay during P2P connection process - Fix issue finding peer with VSDB - Get AP beacon and DTIM to set proper DTIM skipping Change-Id: I7ee923727d0c3ad34c83b5ec1dda8e2aa5ea5834 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c')
-rw-r--r--drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c b/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c
index 180336a..046bd02 100644
--- a/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c
+++ b/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c
@@ -21,7 +21,7 @@
* software in any way with any other Broadcom software provided under a license
* other than the GPL, without Broadcom's express prior written consent.
*
- * $Id: bcmsdh_sdmmc.c 362913 2012-10-15 11:26:11Z $
+ * $Id: bcmsdh_sdmmc.c 379078 2013-01-16 00:41:36Z $
*/
#include <typedefs.h>
@@ -250,9 +250,9 @@ sdioh_enable_func_intr(void)
return SDIOH_API_RC_FAIL;
}
- /* Enable F1 and F2 interrupts, set master enable */
- reg |= (INTR_CTL_FUNC1_EN | INTR_CTL_FUNC2_EN | INTR_CTL_MASTER_EN);
-
+ /* Enable F1 and F2 interrupts, clear master enable */
+ reg &= ~INTR_CTL_MASTER_EN;
+ reg |= (INTR_CTL_FUNC1_EN | INTR_CTL_FUNC2_EN);
sdio_writeb(gInstance->func[0], reg, SDIOD_CCCR_INTEN, &err);
sdio_release_host(gInstance->func[0]);