From 3daa12116e57b16247d2bda6491111dcdc37ef0d Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Wed, 24 Mar 2010 11:59:38 +0100 Subject: [PATCH] --- yaml --- r: 196755 b: refs/heads/master c: 279fcd48c4a426050422b2d196fd99c2b5ae7d71 h: refs/heads/master i: 196753: 8e4bac78fdbc5a30130784384424f9195563f1c8 196751: 4a93886bcd7a009cbf6ebdbb9d9eb47df0426447 v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/display.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7adba5d08c02..4c6e294703eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 35bc42c50432d3dde0119f7630f1e4574bd67519 +refs/heads/master: 279fcd48c4a426050422b2d196fd99c2b5ae7d71 diff --git a/trunk/drivers/video/omap2/dss/display.c b/trunk/drivers/video/omap2/dss/display.c index 71389630b108..ef8c8529dda2 100644 --- a/trunk/drivers/video/omap2/dss/display.c +++ b/trunk/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; }