summaryrefslogtreecommitdiff
path: root/drivers/media/platform
diff options
context:
space:
mode:
authorBenoit Parrot <bparrot@ti.com>2019-09-20 20:05:46 +0300
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-10-01 22:10:38 +0300
commit158a1dddf2dbce5fdb3053213c1e9b36a54b4d4d (patch)
tree14f46243bacd8598eb387862d0f97c39f435de71 /drivers/media/platform
parentb58e69e9a573e74946498077ae25e5244303e718 (diff)
downloadlinux-158a1dddf2dbce5fdb3053213c1e9b36a54b4d4d.tar.xz
media: am437x-vpfe: fix start streaming error path
When start_streaming fails the h/w module might be left enabled inadvertently. Make sure it is disabled in the error path. Signed-off-by: Benoit Parrot <bparrot@ti.com> Acked-by: Lad Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/platform')
-rw-r--r--drivers/media/platform/am437x/am437x-vpfe.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/platform/am437x/am437x-vpfe.c b/drivers/media/platform/am437x/am437x-vpfe.c
index 66df87d310a2..e0a4c8920df8 100644
--- a/drivers/media/platform/am437x/am437x-vpfe.c
+++ b/drivers/media/platform/am437x/am437x-vpfe.c
@@ -2008,6 +2008,7 @@ err:
vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_QUEUED);
}
+ vpfe_pcr_enable(&vpfe->ccdc, 0);
return ret;
}