* [patch] Staging: media: davinci_vpfe: unlock on error in vpfe_reqbufs()
@ 2016-11-18 11:30 Dan Carpenter
2016-11-22 21:39 ` Laurent Pinchart
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2016-11-18 11:30 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Manjunath Hadli
Cc: Hans Verkuil, Laurent Pinchart, Sakari Ailus, Thaissa Falbo,
Wei Yongjun, Leo Sperling, sayli karnik, linux-media,
kernel-janitors
We should unlock before returning this error code in vpfe_reqbufs().
Fixes: 622897da67b3 ("[media] davinci: vpfe: add v4l2 video driver support")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c
index c34bf46..353f3a8 100644
--- a/drivers/staging/media/davinci_vpfe/vpfe_video.c
+++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c
@@ -1362,7 +1362,7 @@ static int vpfe_reqbufs(struct file *file, void *priv,
ret = vb2_queue_init(q);
if (ret) {
v4l2_err(&vpfe_dev->v4l2_dev, "vb2_queue_init() failed\n");
- return ret;
+ goto unlock_out;
}
fh->io_allowed = 1;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [patch] Staging: media: davinci_vpfe: unlock on error in vpfe_reqbufs()
2016-11-18 11:30 [patch] Staging: media: davinci_vpfe: unlock on error in vpfe_reqbufs() Dan Carpenter
@ 2016-11-22 21:39 ` Laurent Pinchart
0 siblings, 0 replies; 2+ messages in thread
From: Laurent Pinchart @ 2016-11-22 21:39 UTC (permalink / raw)
To: Dan Carpenter
Cc: Mauro Carvalho Chehab, Manjunath Hadli, Hans Verkuil,
Laurent Pinchart, Sakari Ailus, Thaissa Falbo, Wei Yongjun,
Leo Sperling, sayli karnik, linux-media, kernel-janitors
Hi Dan,
Thank you for the patch.
On Friday 18 Nov 2016 14:30:24 Dan Carpenter wrote:
> We should unlock before returning this error code in vpfe_reqbufs().
>
> Fixes: 622897da67b3 ("[media] davinci: vpfe: add v4l2 video driver support")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
and applied to my tree. I will send a pull request for v4.11.
> diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c
> b/drivers/staging/media/davinci_vpfe/vpfe_video.c index c34bf46..353f3a8
> 100644
> --- a/drivers/staging/media/davinci_vpfe/vpfe_video.c
> +++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c
> @@ -1362,7 +1362,7 @@ static int vpfe_reqbufs(struct file *file, void *priv,
> ret = vb2_queue_init(q);
> if (ret) {
> v4l2_err(&vpfe_dev->v4l2_dev, "vb2_queue_init() failed\n");
> - return ret;
> + goto unlock_out;
> }
>
> fh->io_allowed = 1;
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-11-22 21:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-18 11:30 [patch] Staging: media: davinci_vpfe: unlock on error in vpfe_reqbufs() Dan Carpenter
2016-11-22 21:39 ` Laurent Pinchart
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).