diff options
| author | Andy Green <andy@openmoko.com> | 2008-11-19 17:11:12 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-19 17:11:12 +0000 |
| commit | dab15c39c8e262e34b8e2cbdc1795bb230baaf6a (patch) | |
| tree | 483f7f6df3c34e8b52ca81c96fd8e19837c74cae /drivers/mfd | |
| parent | 53df9cfb700f5bdb144f232cc0ef02785aa5744f (diff) | |
fix-glamo-mci-ignore-command-properly.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/glamo/glamo-mci.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c index 1a8e70251d5..69ac7af834c 100644 --- a/drivers/mfd/glamo/glamo-mci.c +++ b/drivers/mfd/glamo/glamo-mci.c @@ -585,6 +585,10 @@ static void glamo_mci_send_request(struct mmc_host *mmc) if (host->suspending) { dev_err(&host->pdev->dev, "IGNORING glamo_mci_send_request while " "suspended\n"); + cmd->error = -EIO; + if (cmd->data) + cmd->data->error = -EIO; + mmc_request_done(mmc, mrq); return; } @@ -1027,8 +1031,6 @@ static int glamo_mci_suspend(struct platform_device *dev, pm_message_t state) suspend_sd_idleclk = sd_idleclk; sd_idleclk = 1; - host->suspending++; - ret = mmc_suspend_host(mmc, state); host->suspending++; |