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

V4L/DVB: V4L: vpfe_capture - free ccdc_lock when memory allocation fails 

This patch fixes a bug in vpfe_probe() that doesn't call mutex_unlock() if memory
allocation for ccdc_cfg fails. See also the smatch warning report from Dan
Carpenter that shows this as an issue.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Murali Karicheri 2010-03-01 19:54:02 -03:00 committed by Mauro Carvalho Chehab
parent b704e82a54
commit ab51bec1f8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/video/davinci/vpfe_capture.c
View File

@ -1830,7 +1830,7 @@ static __init int vpfe_probe(struct platform_device *pdev)
if (NULL == ccdc_cfg) { if (NULL == ccdc_cfg) {
v4l2_err(pdev->dev.driver, v4l2_err(pdev->dev.driver,
"Memory allocation failed for ccdc_cfg\n"); "Memory allocation failed for ccdc_cfg\n");
goto probe_free_dev_mem; goto probe_free_lock;
} }
strncpy(ccdc_cfg->name, vpfe_cfg->ccdc, 32); strncpy(ccdc_cfg->name, vpfe_cfg->ccdc, 32);
@ -1982,8 +1982,9 @@ static __init int vpfe_probe(struct platform_device *pdev)
probe_out_release_irq: probe_out_release_irq:
free_irq(vpfe_dev->ccdc_irq0, vpfe_dev); free_irq(vpfe_dev->ccdc_irq0, vpfe_dev);
probe_free_ccdc_cfg_mem: probe_free_ccdc_cfg_mem:
mutex_unlock(&ccdc_lock);
kfree(ccdc_cfg); kfree(ccdc_cfg);
probe_free_lock:
mutex_unlock(&ccdc_lock);
probe_free_dev_mem: probe_free_dev_mem:
kfree(vpfe_dev); kfree(vpfe_dev);
return ret; return ret;