summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@stericsson.com>2012-02-29 15:14:52 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:06:42 +0200
commitcf1aa19048fba67a8dcdf9b2f1164cbb10c5c8b4 (patch)
tree374e388b653a097de39d2ccc3628a92a7475fda4
parentf3a31229c12f9588a709ce214696cf8dbefdc88c (diff)
cw1200: Remove use of mmc_host_enable|disable for sdio
An sdio func driver should not use these functions since it will mess up the internal power state for the sdio host. Moreover it will preventing the sdio host from doing suspend properly. ST-Ericsson ID: 356920 ST-Ericsson FOSS-OUT ID: NA Change-Id: I9fed799b97c84d74cf78a8b5248771bbe229ef9e Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/39202 Reviewed-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com> Tested-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com>
-rw-r--r--drivers/staging/cw1200/cw1200_sdio.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/staging/cw1200/cw1200_sdio.c b/drivers/staging/cw1200/cw1200_sdio.c
index e50aae5577f..670ba935462 100644
--- a/drivers/staging/cw1200/cw1200_sdio.c
+++ b/drivers/staging/cw1200/cw1200_sdio.c
@@ -284,18 +284,10 @@ int cw1200_sdio_set_block_size(struct sbus_priv *self, size_t size)
static int cw1200_sdio_pm(struct sbus_priv *self, bool suspend)
{
- int ret;
+ int ret = 0;
const struct resource *irq = self->pdata->irq;
- struct sdio_func *func = self->func;
-
- sdio_claim_host(func);
- if (suspend)
- ret = mmc_host_disable(func->card->host);
- else
- ret = mmc_host_enable(func->card->host);
- sdio_release_host(func);
- if (!ret && irq)
+ if (irq)
ret = irq_set_irq_wake(irq->start, suspend);
return ret;