diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-02-21 08:32:19 +0100 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-02-21 08:32:19 +0100 |
| commit | 3f60db4bde17088feed5f143582d7661cdbb9a01 (patch) | |
| tree | 21a7866ae6d199cfa8f619ced9500687bdf84f18 /drivers/video/omap2/dss/venc.c | |
| parent | Merge branch 'work/fifomerge' (diff) | |
| parent | Linux 3.3-rc4 (diff) | |
| download | linux-3f60db4bde17088feed5f143582d7661cdbb9a01.tar.xz linux-3f60db4bde17088feed5f143582d7661cdbb9a01.zip | |
Merge commit 'v3.3-rc4'
Diffstat (limited to 'drivers/video/omap2/dss/venc.c')
| -rw-r--r-- | drivers/video/omap2/dss/venc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c index 4172232cdec4..967d4432c67b 100644 --- a/drivers/video/omap2/dss/venc.c +++ b/drivers/video/omap2/dss/venc.c @@ -401,7 +401,7 @@ static void venc_runtime_put(void) DSSDBG("venc_runtime_put\n"); - r = pm_runtime_put(&venc.pdev->dev); + r = pm_runtime_put_sync(&venc.pdev->dev); WARN_ON(r < 0); } |