path: root/drivers/mfd/glamo/glamo-mci.c
diff options
authorAndy Green <andy@openmoko.com>2008-11-19 17:10:58 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2008-11-19 17:10:58 +0000
commit0e7b63e010904140cc39fe98a5d8abd3de7e4f0f (patch)
tree6ec84d2454fb03d49991b3d8f3b83579deeab05a /drivers/mfd/glamo/glamo-mci.c
parenta78ba7c56f9d932b388e567d76a053137043ede0 (diff)
Thomas White noticed that the recent patch from Andrzej cleaning up a nasty cast in the resume_dependency stuff for Glamo broke resume. The problem was that the wrong resume callback was arrived at by the new code, the one in the device's device_driver struct rather than the struct platform_driver that actually holds the right pointer. Since this code will be gone in 2.6.26, I reverted this part of Andrzej's patch, tidying the cast a bit anyway. Reported-by: Thomas White <taw27@cam.ac.uk> Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers/mfd/glamo/glamo-mci.c')
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
index b2030556535..143ab3d732a 100644
--- a/drivers/mfd/glamo/glamo-mci.c
+++ b/drivers/mfd/glamo/glamo-mci.c
@@ -1005,7 +1005,7 @@ static int glamo_mci_suspend(struct platform_device *dev, pm_message_t state)
return ret;
-static int glamo_mci_resume(struct platform_device *dev)
+int glamo_mci_resume(struct platform_device *dev)
struct mmc_host *mmc = platform_get_drvdata(dev);
struct glamo_mci_host *host = mmc_priv(mmc);
@@ -1024,6 +1024,7 @@ static int glamo_mci_resume(struct platform_device *dev)
return ret;
#else /* CONFIG_PM */
#define glamo_mci_suspend NULL