Commit 103b41e9 authored Aug 03, 2023 by Hans de Goede Committed by Greg Kroah-Hartman Sep 23, 2023

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



[ Upstream commit 84b4bd7e0d98166aa32fd470e672721190492eae ]

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: Daniel Scally <dan.scally@ideasonboard.com>
Acked-by: Rui Miguel Silva <rmfrfs@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 009b1202

drivers/media/i2c/ov2680.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -459,7 +459,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 {
		@@ -469,7 +469,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;

		@@ -479,6 +479,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)