diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 23:07:33 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 23:07:33 +0200 |
commit | 608f593b1313080301b76875487af6da508f67a1 (patch) | |
tree | b775454cd4d1d380134c2d91ff79d0375987dc64 /drivers/video/omap2/dss/dispc.c | |
parent | Merge branch 'next/board-samsung-2' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
parent | Linux 3.5-rc7 (diff) | |
download | linux-608f593b1313080301b76875487af6da508f67a1.tar.xz linux-608f593b1313080301b76875487af6da508f67a1.zip |
Merge tag 'v3.5-rc7' into next/boards
Linux 3.5-rc7
Prerequisite for samsung/board3 branch.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/video/omap2/dss/dispc.c')
-rw-r--r-- | drivers/video/omap2/dss/dispc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index 4749ac356469..397d4eee11bb 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c @@ -384,7 +384,7 @@ void dispc_runtime_put(void) DSSDBG("dispc_runtime_put\n"); r = pm_runtime_put_sync(&dispc.pdev->dev); - WARN_ON(r < 0); + WARN_ON(r < 0 && r != -ENOSYS); } static inline bool dispc_mgr_is_lcd(enum omap_channel channel) |