[media] s5p-fimc: Fix bug in capture node open()

When video pipeline initialization fails, the ST_CAPT_BUSY flag
needs to be cleared before pm_runtime_put_sync is called.
Otherwise the runtime suspend routine tries to suspend device,
rather than just turning it off. Also fix potential null pointer
dereference in fimc_pipeline_shutdown().

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/media/video/s5p-fimc/fimc-capture.c b/drivers/media/video/s5p-fimc/fimc-capture.c
index 354574591908..7083107c2b37 100644
--- a/drivers/media/video/s5p-fimc/fimc-capture.c
+++ b/drivers/media/video/s5p-fimc/fimc-capture.c
@@ -499,10 +499,10 @@ static int fimc_capture_open(struct file *file)
                 if (ret < 0) {
                         dev_err(&fimc->pdev->dev,
                                 "Video pipeline initialization failed\n");
+                        clear_bit(ST_CAPT_BUSY, &fimc->state);
                         pm_runtime_put_sync(&fimc->pdev->dev);
                         fimc->vid_cap.refcnt--;
                         v4l2_fh_release(file);
-                        clear_bit(ST_CAPT_BUSY, &fimc->state);
                         return ret;
                 }
                 ret = fimc_capture_ctrls_create(fimc);