--- drivers/net/wireless/libertas/if_sdio.c

+++ drivers/net/wireless/libertas/if_sdio.c

@@ -34,6 +34,8 @@

#include <linux/mmc/card.h>

#include <linux/mmc/sdio_func.h>

#include <linux/mmc/sdio_ids.h>

+#include <linux/mmc/sdio.h>

+#include <linux/mmc/host.h>

#include "host.h"

#include "decl.h"

@@ -883,6 +885,7 @@ static int if_sdio_probe(struct sdio_fun

int ret, i;

unsigned int model;

struct if_sdio_packet *packet;

+ struct mmc_host *host = func->card->host;

lbs_deb_enter(LBS_DEB_SDIO);

@@ -963,6 +966,25 @@ static int if_sdio_probe(struct sdio_fun

if (ret)

goto disable;

+ /* For 1-bit transfers to the 8686 model, we need to enable the

+ * interrupt flag in the CCCR register. Set the MMC_QUIRK_LENIENT_FN0

+ * bit to allow access to non-vendor registers. */

+ if ((card->model == IF_SDIO_MODEL_8686) &&

+ (host->caps & MMC_CAP_SDIO_IRQ) &&

+ (host->ios.bus_width == MMC_BUS_WIDTH_1)) {

+ u8 reg;

+

+ func->card->quirks |= MMC_QUIRK_LENIENT_FN0;

+ reg = sdio_f0_readb(func, SDIO_CCCR_IF, &ret);

+ if (ret)

+ goto release_int;

+

+ reg |= SDIO_BUS_ECSI;

+ sdio_f0_writeb(func, reg, SDIO_CCCR_IF, &ret);

+ if (ret)

+ goto release_int;

+ }

+

card->ioport = sdio_readb(func, IF_SDIO_IOPORT, &ret);

if (ret)

goto release_int;