From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mailout3.samsung.com ([203.254.224.33]:42094 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964832Ab2HQHeV (ORCPT ); Fri, 17 Aug 2012 03:34:21 -0400 From: Marek Szyprowski To: 'Dan Carpenter' , 'Mauro Carvalho Chehab' Cc: 'Hans Verkuil' , =?iso-8859-2?Q?'Tomasz_Mo=F1'?= , 'Guennadi Liakhovetski' , linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org References: <20120814065856.GC4791@elgon.mountain> In-reply-to: <20120814065856.GC4791@elgon.mountain> Subject: RE: [patch] [media] mem2mem_testdev: unlock and return error code properly Date: Fri, 17 Aug 2012 09:34:07 +0200 Message-id: <01eb01cd7c4a$b271a9b0$1754fd10$%szyprowski@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=iso-8859-2 Content-transfer-encoding: 7bit Content-language: pl Sender: linux-media-owner@vger.kernel.org List-ID: Hi Dan, On Tuesday, August 14, 2012 8:59 AM Dan Carpenter wrote: > We recently added locking to this function, but there was an error path > which accidentally returned holding a lock. Also we returned zero on > failure on some paths instead of the error code. > > Signed-off-by: Dan Carpenter Thanks for the patch! Acked-by: Marek Szyprowski > --- > Applies to linux-next. > > diff --git a/drivers/media/video/mem2mem_testdev.c b/drivers/media/video/mem2mem_testdev.c > index 0aa8c47..0b496f3 100644 > --- a/drivers/media/video/mem2mem_testdev.c > +++ b/drivers/media/video/mem2mem_testdev.c > @@ -911,10 +911,9 @@ static int m2mtest_open(struct file *file) > v4l2_ctrl_new_custom(hdl, &m2mtest_ctrl_trans_time_msec, NULL); > v4l2_ctrl_new_custom(hdl, &m2mtest_ctrl_trans_num_bufs, NULL); > if (hdl->error) { > - int err = hdl->error; > - > + rc = hdl->error; > v4l2_ctrl_handler_free(hdl); > - return err; > + goto open_unlock; > } > ctx->fh.ctrl_handler = hdl; > v4l2_ctrl_handler_setup(hdl); > @@ -946,7 +945,7 @@ static int m2mtest_open(struct file *file) > > open_unlock: > mutex_unlock(&dev->dev_mutex); > - return 0; > + return rc; > } > > static int m2mtest_release(struct file *file) Best regards -- Marek Szyprowski Samsung Poland R&D Center