Commit a5bc63f2 authored Nov 18, 2016 by Christophe JAILLET Committed by Mauro Carvalho Chehab Jan 30, 2017

[media] soc-camera: Fix a return value in case of error

If 'ov9640_reg_read()' does not return 0, then 'val' is left unmodified.
As it is not initialized either, the return value can be anything.

It is likely that returning the error code was expected here.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

parent f41003a2

drivers/media/i2c/soc_camera/ov9640.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -233,7 +233,7 @@ static int ov9640_reg_rmw(struct i2c_client *client, u8 reg, u8 set, u8 unset)
		if (ret) {
		dev_err(&client->dev,
		"[Read]-Modify-Write of register %02x failed!\n", reg);
		return val;
		return ret;
		}

		val \|= set;