openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] s5p-mfc: Context handling in open() bugfix 

Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Kamil Debski 2012-11-22 10:00:28 -03:00 committed by Mauro Carvalho Chehab
parent 317b4ca498
commit 1b73ba0be4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/platform/s5p-mfc/s5p_mfc.c
View File

@ -855,16 +855,16 @@ static int s5p_mfc_open(struct file *file)
s5p_mfc_deinit_hw(dev); s5p_mfc_deinit_hw(dev);
err_init_hw: err_init_hw:
err_load_fw: err_load_fw:
dev->ctx[ctx->num] = NULL;
del_timer_sync(&dev->watchdog_timer);
err_pwr_enable: err_pwr_enable:
if (dev->num_inst == 1) { if (dev->num_inst == 1) {
if (s5p_mfc_power_off() < 0) if (s5p_mfc_power_off() < 0)
mfc_err("power off failed\n"); mfc_err("power off failed\n");
del_timer_sync(&dev->watchdog_timer);
} }
err_ctrls_setup: err_ctrls_setup:
s5p_mfc_dec_ctrls_delete(ctx); s5p_mfc_dec_ctrls_delete(ctx);
err_bad_node: err_bad_node:
dev->ctx[ctx->num] = NULL;
err_no_ctx: err_no_ctx:
v4l2_fh_del(&ctx->fh); v4l2_fh_del(&ctx->fh);
v4l2_fh_exit(&ctx->fh); v4l2_fh_exit(&ctx->fh);