Commit 2b080c5d authored by Dan Carpenter's avatar Dan Carpenter Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: davinci: don't return under lock on error path 



If the kmalloc() failed for "ccdc_cfg = kmalloc(...);" then we would exit
with the lock held.  I moved the mutex_lock() below the allocation
because it isn't protecting anything in that block and allocations are
allocations are sometimes slow.

Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Acked-by: default avatarVaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 3f113e36

drivers/media/video/davinci/vpfe_capture.c

+2 −1
Original line number Diff line number Diff line
@@ -1861,7 +1861,6 @@ static __init int vpfe_probe(struct platform_device *pdev) 
		goto probe_free_dev_mem;

	}



	mutex_lock(&ccdc_lock);

	/* Allocate memory for ccdc configuration */

	ccdc_cfg = kmalloc(sizeof(struct ccdc_config), GFP_KERNEL);

	if (NULL == ccdc_cfg) {
@@ -1870,6 +1869,8 @@ static __init int vpfe_probe(struct platform_device *pdev) 
		goto probe_free_lock;

	}



	mutex_lock(&ccdc_lock);



	strncpy(ccdc_cfg->name, vpfe_cfg->ccdc, 32);

	/* Get VINT0 irq resource */

	res1 = platform_get_resource(pdev, IORESOURCE_IRQ, 0);