aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c/smiapp/smiapp-core.c
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2019-10-29 15:24:01 -0300
committerMauro Carvalho Chehab <mchehab@kernel.org>2019-11-05 08:20:22 -0300
commit17f74b145af3db5823c1a5d6ac9e34f983b789d4 (patch)
tree951af8013cb914cdafa7623b3d2fbc7faddfb531 /drivers/media/i2c/smiapp/smiapp-core.c
parentdca5ef2aa1e62f99372d22688da089629b496ed5 (diff)
media: smiapp: unlock on error in smiapp_start_streaming()
We added two new error paths to smiapp_start_streaming(), but we can't return directly without dropping the "sensor->mutex" lock. Fixes: f8c4352c1bef ("media: smiapp: Move binning configuration to streaming start") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'drivers/media/i2c/smiapp/smiapp-core.c')
-rw-r--r--drivers/media/i2c/smiapp/smiapp-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c
index 77dfce7c3be9..84f9771b5fed 100644
--- a/drivers/media/i2c/smiapp/smiapp-core.c
+++ b/drivers/media/i2c/smiapp/smiapp-core.c
@@ -1362,13 +1362,13 @@ static int smiapp_start_streaming(struct smiapp_sensor *sensor)
rval = smiapp_write(
sensor, SMIAPP_REG_U8_BINNING_TYPE, binning_type);
if (rval < 0)
- return rval;
+ goto out;
binning_mode = 1;
}
rval = smiapp_write(sensor, SMIAPP_REG_U8_BINNING_MODE, binning_mode);
if (rval < 0)
- return rval;
+ goto out;
/* Set up PLL */
rval = smiapp_pll_configure(sensor);

Privacy Policy