summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2021-12-22 15:20:22 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-04-15 14:14:42 +0200
commitbfcae8cb77c0fb157531a5c329aa723b7274d2f1 (patch)
treea130ed100f41e32d9424f887d326ef9bfd380f7f /drivers/media
parentba3ffe0e84c4b25ed26328dd67f4483bd250a675 (diff)
downloadlinux-stable-bfcae8cb77c0fb157531a5c329aa723b7274d2f1.tar.gz
linux-stable-bfcae8cb77c0fb157531a5c329aa723b7274d2f1.tar.bz2
linux-stable-bfcae8cb77c0fb157531a5c329aa723b7274d2f1.zip
media: davinci: vpif: fix unbalanced runtime PM get
commit 4a321de239213300a714fa0353a5f1272d381a44 upstream. Make sure to balance the runtime PM usage counter on driver unbind. Fixes: 407ccc65bfd2 ("[media] davinci: vpif: add pm_runtime support") Cc: stable@vger.kernel.org # 3.9 Cc: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Johan Hovold <johan@kernel.org> Reviewed-by: Lad Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/davinci/vpif.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/platform/davinci/vpif.c b/drivers/media/platform/davinci/vpif.c
index 16352e2263d2..00ce9f276bec 100644
--- a/drivers/media/platform/davinci/vpif.c
+++ b/drivers/media/platform/davinci/vpif.c
@@ -496,6 +496,7 @@ static int vpif_probe(struct platform_device *pdev)
static int vpif_remove(struct platform_device *pdev)
{
+ pm_runtime_put(&pdev->dev);
pm_runtime_disable(&pdev->dev);
return 0;
}