> -----Original Message----- > From: Dan Carpenter [mailto:error27@xxxxxxxxx] > Sent: Wednesday, April 07, 2010 2:51 PM > To: Mauro Carvalho Chehab > Cc: Hans Verkuil; Hiremath, Vaibhav; Laurent Pinchart; Karicheri, > Muralidharan; linux-media@xxxxxxxxxxxxxxx; kernel-janitors@xxxxxxxxxxxxxxx > Subject: [patch] 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. [Hiremath, Vaibhav] Good catch and thanks for the patch. Acked-by: Vaibhav Hiremath <hvaibhav@xxxxxx> Thanks, Vaibhav > > Signed-off-by: Dan Carpenter <error27@xxxxxxxxx> > > diff --git a/drivers/media/video/davinci/vpfe_capture.c > b/drivers/media/video/davinci/vpfe_capture.c > index 7cf042f..5c83f90 100644 > --- a/drivers/media/video/davinci/vpfe_capture.c > +++ b/drivers/media/video/davinci/vpfe_capture.c > @@ -1824,7 +1824,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) { > @@ -1833,6 +1832,8 @@ static __init int vpfe_probe(struct platform_device > *pdev) > goto probe_free_dev_mem; > } > > + mutex_lock(&ccdc_lock); > + > strncpy(ccdc_cfg->name, vpfe_cfg->ccdc, 32); > /* Get VINT0 irq resource */ > res1 = platform_get_resource(pdev, IORESOURCE_IRQ, 0); -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
