Skip to content

Commit

Permalink
V4L/DVB: V4L: vpfe_capture - free ccdc_lock when memory allocation fails
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Murali Karicheri authored and Mauro Carvalho Chehab committed May 6, 2010
1 parent b704e82 commit ab51bec
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/media/video/davinci/vpfe_capture.c
Original file line number Diff line number Diff line change
Expand Up @@ -1830,7 +1830,7 @@ static __init int vpfe_probe(struct platform_device *pdev)
if (NULL == ccdc_cfg) {
v4l2_err(pdev->dev.driver,
"Memory allocation failed for ccdc_cfg\n");
goto probe_free_dev_mem;
goto probe_free_lock;
}

strncpy(ccdc_cfg->name, vpfe_cfg->ccdc, 32);
Expand Down Expand Up @@ -1982,8 +1982,9 @@ static __init int vpfe_probe(struct platform_device *pdev)
probe_out_release_irq:
free_irq(vpfe_dev->ccdc_irq0, vpfe_dev);
probe_free_ccdc_cfg_mem:
mutex_unlock(&ccdc_lock);
kfree(ccdc_cfg);
probe_free_lock:
mutex_unlock(&ccdc_lock);
probe_free_dev_mem:
kfree(vpfe_dev);
return ret;
Expand Down

0 comments on commit ab51bec

Please sign in to comment.