diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-05-23 17:02:26 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-06-04 11:04:41 +0300 |
| commit | 5025ce070e2dff80bcf015a34a82edcf78229287 (patch) | |
| tree | 8c98c80c359466844de75dfc08dd313be3606c7a /drivers/video/omap2 | |
| parent | d1700f9258552294300083eb62f83262f21ae1db (diff) | |
| download | kernel-common-5025ce070e2dff80bcf015a34a82edcf78229287.tar.gz kernel-common-5025ce070e2dff80bcf015a34a82edcf78229287.tar.bz2 kernel-common-5025ce070e2dff80bcf015a34a82edcf78229287.zip | |
OMAPDSS: fix bogus WARN_ON in dss_runtime_put()
pm_runtime_put_sync() in dss_runtime_put() returns -EBUSY when any child
of dss is still enabled. This happens, for example, when a display
output is enabled and one dumps the clocks via debugfs. This causes
dss_runtime_get & put to be called.
While I couldn't find anything about this in the documentation and it
wasn't immediately clear from runtime_pm code, it looks to me that
pm_runtime_put_sync() returns -EBUSY to inform that things went fine,
but the device could not be turned off as there are still child devices
that are enabled. This is not a problem.
This patch skips the WARN_ON if pm_runtime_put_sync() returns -EBUSY.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2')
| -rw-r--r-- | drivers/video/omap2/dss/dss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c index 6ea1ff149f6f..770632359a17 100644 --- a/drivers/video/omap2/dss/dss.c +++ b/drivers/video/omap2/dss/dss.c @@ -731,7 +731,7 @@ static void dss_runtime_put(void) DSSDBG("dss_runtime_put\n"); r = pm_runtime_put_sync(&dss.pdev->dev); - WARN_ON(r < 0); + WARN_ON(r < 0 && r != -EBUSY); } /* DEBUGFS */ |