git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
[pandora-kernel.git]
/
drivers
/
mmc
/
host
/
msm_sdcc.c
diff --git
a/drivers/mmc/host/msm_sdcc.c
b/drivers/mmc/host/msm_sdcc.c
index
61f1d27
..
24e0945
100644
(file)
--- a/
drivers/mmc/host/msm_sdcc.c
+++ b/
drivers/mmc/host/msm_sdcc.c
@@
-1327,7
+1327,7
@@
msmsdcc_suspend(struct platform_device *dev, pm_message_t state)
disable_irq(host->stat_irq);
if (mmc->card && mmc->card->type != MMC_TYPE_SDIO)
- rc = mmc_suspend_host(mmc
, state
);
+ rc = mmc_suspend_host(mmc);
if (!rc)
msmsdcc_writel(host, 0, MMCIMASK0);
if (host->clks_on)