Commit 90e614bb authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab

[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: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b6a509df
...@@ -499,10 +499,10 @@ static int fimc_capture_open(struct file *file) ...@@ -499,10 +499,10 @@ static int fimc_capture_open(struct file *file)
if (ret < 0) { if (ret < 0) {
dev_err(&fimc->pdev->dev, dev_err(&fimc->pdev->dev,
"Video pipeline initialization failed\n"); "Video pipeline initialization failed\n");
clear_bit(ST_CAPT_BUSY, &fimc->state);
pm_runtime_put_sync(&fimc->pdev->dev); pm_runtime_put_sync(&fimc->pdev->dev);
fimc->vid_cap.refcnt--; fimc->vid_cap.refcnt--;
v4l2_fh_release(file); v4l2_fh_release(file);
clear_bit(ST_CAPT_BUSY, &fimc->state);
return ret; return ret;
} }
ret = fimc_capture_ctrls_create(fimc); ret = fimc_capture_ctrls_create(fimc);
......
...@@ -193,9 +193,13 @@ int __fimc_pipeline_shutdown(struct fimc_pipeline *p) ...@@ -193,9 +193,13 @@ int __fimc_pipeline_shutdown(struct fimc_pipeline *p)
int fimc_pipeline_shutdown(struct fimc_pipeline *p) int fimc_pipeline_shutdown(struct fimc_pipeline *p)
{ {
struct media_entity *me = &p->subdevs[IDX_SENSOR]->entity; struct media_entity *me;
int ret; int ret;
if (!p || !p->subdevs[IDX_SENSOR])
return -EINVAL;
me = &p->subdevs[IDX_SENSOR]->entity;
mutex_lock(&me->parent->graph_mutex); mutex_lock(&me->parent->graph_mutex);
ret = __fimc_pipeline_shutdown(p); ret = __fimc_pipeline_shutdown(p);
mutex_unlock(&me->parent->graph_mutex); mutex_unlock(&me->parent->graph_mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment