diff options
| author | Marcus Lorentzon <marcus.xm.lorentzon@stericsson.com> | 2011-10-11 18:03:30 +0200 |
|---|---|---|
| committer | Robert Marklund <robert.marklund@stericsson.com> | 2011-10-27 16:08:37 +0200 |
| commit | 47e074271195bcd3e3095a945d3b8af0dcbfeb23 (patch) | |
| tree | 0c4e7ea230e4b7e392f061e64ed5d3260c8d08c6 | |
| parent | c7c031427fc9c9812cbe2bb05b21f346cdb67419 (diff) | |
video: mcde: Fix suspend oops in Android
Generic suspend/resume should not be enabled on Android
since Android implement power management in early suspend.
ST-Ericsson ID: 365249
ST-Ericsson Linux next: NA
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I35b5e004d48a4be8e98913be8b3ed4abbf48f9a0
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33727
Reviewed-by: Marcus LORENTZON <marcus.xm.lorentzon@stericsson.com>
Tested-by: Marcus LORENTZON <marcus.xm.lorentzon@stericsson.com>
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
| -rw-r--r-- | drivers/video/mcde/mcde_bus.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/video/mcde/mcde_bus.c b/drivers/video/mcde/mcde_bus.c index 852451954a4..a600844a9ac 100644 --- a/drivers/video/mcde/mcde_bus.c +++ b/drivers/video/mcde/mcde_bus.c @@ -109,7 +109,11 @@ static int mcde_drv_suspend(struct device *_dev, pm_message_t state) if (drv->suspend) return drv->suspend(dev, state); else +#if !defined(CONFIG_HAS_EARLYSUSPEND) && defined(CONFIG_PM) return dev->set_power_mode(dev, MCDE_DISPLAY_PM_OFF); +#else + return 0; +#endif } static int mcde_drv_resume(struct device *_dev) @@ -120,7 +124,11 @@ static int mcde_drv_resume(struct device *_dev) if (drv->resume) return drv->resume(dev); else +#if !defined(CONFIG_HAS_EARLYSUSPEND) && defined(CONFIG_PM) return dev->set_power_mode(dev, MCDE_DISPLAY_PM_STANDBY); +#else + return 0; +#endif } /* Bus device */ |