diff options
| author | Andy Green <andy@openmoko.com> | 2008-11-19 17:10:58 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-19 17:10:58 +0000 |
| commit | 0e7b63e010904140cc39fe98a5d8abd3de7e4f0f (patch) | |
| tree | 6ec84d2454fb03d49991b3d8f3b83579deeab05a | |
| parent | a78ba7c56f9d932b388e567d76a053137043ede0 (diff) | |
revert-fix-build-with-no-config_mmc-glamo-resume-callback-part.patch
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>
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-gta02.c | 4 | ||||
| -rw-r--r-- | drivers/mfd/glamo/glamo-mci.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c index 9df7335711e..8ade86d8e9a 100644 --- a/arch/arm/mach-s3c2440/mach-gta02.c +++ b/arch/arm/mach-s3c2440/mach-gta02.c @@ -1425,8 +1425,10 @@ static int gta02_glamo_mci_all_dependencies_resumed(struct platform_device *dev) static void gta02_glamo_mci_suspending(struct platform_device *dev) { + int glamo_mci_resume(struct platform_device *dev); + #if defined(CONFIG_MFD_GLAMO_MCI) && defined(CONFIG_PM) - resume_dep_glamo_mci_pcf.callback = (void *)dev->dev.driver->resume; + resume_dep_glamo_mci_pcf.callback = (void (*)(void *))glamo_mci_resume; resume_dep_glamo_mci_pcf.context = (void *)dev; pcf50633_register_resume_dependency(pcf50633_global, &resume_dep_glamo_mci_pcf); 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; } +EXPORT_SYMBOL_GPL(glamo_mci_resume); #else /* CONFIG_PM */ #define glamo_mci_suspend NULL |