summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Parsons <lost.distance@yahoo.com>2011-08-09 18:27:24 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2011-10-24 14:09:09 +0200
commit3c6e36537e40a41ddb0e27a80149cfd341a92d7d (patch)
tree6dc56171413dfca14dd533f29924c0585d69b63d
parentmfd: Remove spurious newlines from wm831x-irq.c (diff)
downloadlinux-3c6e36537e40a41ddb0e27a80149cfd341a92d7d.tar.xz
linux-3c6e36537e40a41ddb0e27a80149cfd341a92d7d.zip
mfd: Fix asic3 based SD card resume after suspend
The mfd/asic3 driver did not define the suspend/resume handlers for the mmc cell driver. Consequently the mmc driver did not resume properly after returning from suspend, making sd cards unusable and preventing suspend from being entered a second time. This patch adds the suspend/resume handlers, fixing the problem. Signed-off-by: Paul Parsons <lost.distance@yahoo.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/mfd/asic3.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index c71ae09430c5..5ac2961fedfe 100644
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -779,6 +779,8 @@ static struct mfd_cell asic3_cell_mmc = {
.name = "tmio-mmc",
.enable = asic3_mmc_enable,
.disable = asic3_mmc_disable,
+ .suspend = asic3_mmc_disable,
+ .resume = asic3_mmc_enable,
.platform_data = &asic3_mmc_data,
.pdata_size = sizeof(asic3_mmc_data),
.num_resources = ARRAY_SIZE(asic3_mmc_resources),