diff options
| author | Jani Nikula <ext-jani.1.nikula@nokia.com> | 2010-03-24 11:59:38 +0100 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-05-18 14:14:30 +0300 |
| commit | 279fcd48c4a426050422b2d196fd99c2b5ae7d71 (patch) | |
| tree | 37c3cdf3a9d2ba9fbbf09389821335eca01c5e4e /drivers/video/omap2/dss | |
| parent | 35bc42c50432d3dde0119f7630f1e4574bd67519 (diff) | |
| download | linux-279fcd48c4a426050422b2d196fd99c2b5ae7d71.tar.bz2 | |
OMAP: DSS2: Fix device disable when driver is not loaded
Only call driver disable when device isn't already disabled, which also
handles the driver not loaded case.
Signed-off-by: Jani Nikula <ext-jani.1.nikula@nokia.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Diffstat (limited to 'drivers/video/omap2/dss')
| -rw-r--r-- | drivers/video/omap2/dss/display.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/display.c b/drivers/video/omap2/dss/display.c index 71389630b108..ef8c8529dda2 100644 --- a/drivers/video/omap2/dss/display.c +++ b/drivers/video/omap2/dss/display.c @@ -545,7 +545,10 @@ int dss_resume_all_devices(void) static int dss_disable_device(struct device *dev, void *data) { struct omap_dss_device *dssdev = to_dss_device(dev); - dssdev->driver->disable(dssdev); + + if (dssdev->state != OMAP_DSS_DISPLAY_DISABLED) + dssdev->driver->disable(dssdev); + return 0; } |