| From e7dd20be25578b5fdb4eda6f30cf4c9180cb4709 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 30 Mar 2019 10:01:32 -0400 |
| Subject: media: ov2659: fix unbalanced mutex_lock/unlock |
| |
| From: Akinobu Mita <akinobu.mita@gmail.com> |
| |
| [ Upstream commit 384538bda10913e5c94ec5b5d34bd3075931bcf4 ] |
| |
| Avoid returning with mutex locked. |
| |
| Fixes: fa8cb6444c32 ("[media] ov2659: Don't depend on subdev API") |
| |
| Cc: "Lad, Prabhakar" <prabhakar.csengg@gmail.com> |
| Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> |
| Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> |
| Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/media/i2c/ov2659.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/media/i2c/ov2659.c b/drivers/media/i2c/ov2659.c |
| index ade3c48e2e0cf..18546f950d792 100644 |
| --- a/drivers/media/i2c/ov2659.c |
| +++ b/drivers/media/i2c/ov2659.c |
| @@ -1137,7 +1137,7 @@ static int ov2659_set_fmt(struct v4l2_subdev *sd, |
| mf = v4l2_subdev_get_try_format(sd, cfg, fmt->pad); |
| *mf = fmt->format; |
| #else |
| - return -ENOTTY; |
| + ret = -ENOTTY; |
| #endif |
| } else { |
| s64 val; |
| -- |
| 2.20.1 |
| |
