Commit 84b4bd7e authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

media: ov2680: Fix regulators being left enabled on ov2680_power_on() errors 



When the ov2680_power_on() "sensor soft reset failed" path is hit during
probe() the WARN() about putting an enabled regulator at
drivers/regulator/core.c:2398 triggers 3 times (once for each regulator),
filling dmesg with backtraces.

Fix this by properly disabling the regulators on ov2680_power_on() errors.

Fixes: 3ee47cad ("media: ov2680: Add Omnivision OV2680 sensor driver")
Reviewed-by: default avatarDaniel Scally <dan.scally@ideasonboard.com>
Acked-by: default avatarRui Miguel Silva <rmfrfs@gmail.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent c0e97a4b

drivers/media/i2c/ov2680.c

+6 −2
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ static int ov2680_power_on(struct ov2680_dev *sensor) 
		ret = ov2680_write_reg(sensor, OV2680_REG_SOFT_RESET, 0x01);

		if (ret != 0) {

			dev_err(dev, "sensor soft reset failed\n");

			return ret;

			goto err_disable_regulators;

		}

		usleep_range(1000, 2000);

	} else {
@@ -485,7 +485,7 @@ static int ov2680_power_on(struct ov2680_dev *sensor) 


	ret = clk_prepare_enable(sensor->xvclk);

	if (ret < 0)

		return ret;

		goto err_disable_regulators;



	sensor->is_enabled = true;
@@ -495,6 +495,10 @@ static int ov2680_power_on(struct ov2680_dev *sensor) 
	ov2680_stream_disable(sensor);



	return 0;



err_disable_regulators:

	regulator_bulk_disable(OV2680_NUM_SUPPLIES, sensor->supplies);

	return ret;

}



static int ov2680_s_power(struct v4l2_subdev *sd, int on)