| From 30fef7ec3ab248089f8795dd6e6d66812e092071 Mon Sep 17 00:00:00 2001 |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| Date: Fri, 18 Nov 2016 09:30:24 -0200 |
| Subject: [PATCH] staging: media: davinci_vpfe: unlock on error in |
| vpfe_reqbufs() |
| |
| commit c4a407b91f4b644145492e28723f9f880efb1da0 upstream. |
| |
| 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> |
| Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c |
| index 3319fb8f7d01..a170b38b141b 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; |
| -- |
| 2.10.1 |
| |
