From 09bfc6e24fd2f478b8ebe837e4cf89c68a72df28 Mon Sep 17 00:00:00 2001 From: Arik Nemtsov Date: Fri, 18 Mar 2011 14:49:57 +0200 Subject: [PATCH] --- yaml --- r: 247103 b: refs/heads/master c: 1d732e8cf3dcc09d7c862b6c12f876533529073d h: refs/heads/master i: 247101: 678fa9ba58f8035860d78b2f9dd5eb318eafc244 247099: 9a54510cfe7b7877876bc75834bfb4a647707a12 247095: effdc2379bfb2a8b388b1b6596cc93b94c30f681 247087: 42641698c86ed14e006108772ff36aa07379bbc6 247071: 4c90494a6c53395b6452c4cdec829496c2661899 247039: 26842f26244e9660586b2337616aabfa1c4be766 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/sdio.c | 3 +++ trunk/drivers/net/wireless/wl12xx/sdio_test.c | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 326db5558d39..50f3061c82fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 958b20e068be2c6267c2b5764babf15b0d4f5c69 +refs/heads/master: 1d732e8cf3dcc09d7c862b6c12f876533529073d diff --git a/trunk/drivers/net/wireless/wl12xx/sdio.c b/trunk/drivers/net/wireless/wl12xx/sdio.c index 5a2951ed6eda..2ade222f7cbb 100644 --- a/trunk/drivers/net/wireless/wl12xx/sdio.c +++ b/trunk/drivers/net/wireless/wl12xx/sdio.c @@ -246,6 +246,9 @@ static int __devinit wl1271_probe(struct sdio_func *func, /* Grab access to FN0 for ELP reg. */ func->card->quirks |= MMC_QUIRK_LENIENT_FN0; + /* Use block mode for transferring over one block size of data */ + func->card->quirks |= MMC_QUIRK_BLKSZ_FOR_BYTE_MODE; + wlan_data = wl12xx_get_platform_data(); if (IS_ERR(wlan_data)) { ret = PTR_ERR(wlan_data); diff --git a/trunk/drivers/net/wireless/wl12xx/sdio_test.c b/trunk/drivers/net/wireless/wl12xx/sdio_test.c index 968249a4da39..f28915392877 100644 --- a/trunk/drivers/net/wireless/wl12xx/sdio_test.c +++ b/trunk/drivers/net/wireless/wl12xx/sdio_test.c @@ -417,6 +417,9 @@ static int __devinit wl1271_probe(struct sdio_func *func, /* Grab access to FN0 for ELP reg. */ func->card->quirks |= MMC_QUIRK_LENIENT_FN0; + /* Use block mode for transferring over one block size of data */ + func->card->quirks |= MMC_QUIRK_BLKSZ_FOR_BYTE_MODE; + wlan_data = wl12xx_get_platform_data(); if (IS_ERR(wlan_data)) { ret = PTR_ERR(wlan_data);