V4L/DVB: V4L: vpfe_capture - free ccdc_lock when memory allocation fails (ab51bec1) · Commits · 戴 / test

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>

drivers/media/video/davinci/vpfe_capture.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -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);
		@@ -1982,8 +1982,9 @@ probe_out_video_release:
		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;

Admin message