diff options
| author | David S. Miller <davem@davemloft.net> | 2012-02-11 05:32:28 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-11 05:32:28 +0100 |
| commit | d5ef8a4d87ab21d575ac86366599c9152a28028d (patch) | |
| tree | 8b1be85ad1af7ee6a0e3e36c77ae738c966c1f21 /drivers/video/omap2/dss/rfbi.c | |
| parent | igb: fix warning about unused function (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-d5ef8a4d87ab21d575ac86366599c9152a28028d.tar.xz linux-d5ef8a4d87ab21d575ac86366599c9152a28028d.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/infiniband/hw/nes/nes_cm.c
Simple whitespace conflict.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/video/omap2/dss/rfbi.c')
| -rw-r--r-- | drivers/video/omap2/dss/rfbi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/rfbi.c b/drivers/video/omap2/dss/rfbi.c index 814bb9500dca..55f398014f33 100644 --- a/drivers/video/omap2/dss/rfbi.c +++ b/drivers/video/omap2/dss/rfbi.c @@ -140,7 +140,7 @@ static void rfbi_runtime_put(void) DSSDBG("rfbi_runtime_put\n"); - r = pm_runtime_put(&rfbi.pdev->dev); + r = pm_runtime_put_sync(&rfbi.pdev->dev); WARN_ON(r < 0); } |