Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 560624cf authored by Hans de Goede's avatar Hans de Goede Committed by Greg Kroah-Hartman
Browse files

media: ov2680: Fix ov2680_bayer_order() 



[ Upstream commit 50a7bad4e0a37d7018ab6fe843dd84bc6b2ecf72 ]

The index into ov2680_hv_flip_bayer_order[] should be 0-3, but
ov2680_bayer_order() was using 0 + BIT(2) + (BIT(2) << 1) as
max index, while the intention was to use: 0 + 1 + 2 as max index.

Fix the index calculation in ov2680_bayer_order(), while at it
also just use the ctrl values rather then reading them back using
a slow i2c-read transaction.

This also allows making the function void, since there now are
no more i2c-reads to error check.

Note the check for the ctrls being NULL is there to allow
adding an ov2680_fill_format() helper later, which will call
ov2680_set_bayer_order() during probe() before the ctrls are created.

[Sakari Ailus: Change all users of ov2680_set_bayer_order() here]

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>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 218b60bc

drivers/media/i2c/ov2680.c

+14 −19
Original line number Diff line number Diff line
@@ -315,26 +315,17 @@ static void ov2680_power_down(struct ov2680_dev *sensor) 
	usleep_range(5000, 10000);

}



static int ov2680_bayer_order(struct ov2680_dev *sensor)

static void ov2680_set_bayer_order(struct ov2680_dev *sensor)

{

	u32 format1;

	u32 format2;

	u32 hv_flip;

	int ret;



	ret = ov2680_read_reg(sensor, OV2680_REG_FORMAT1, &format1);

	if (ret < 0)

		return ret;

	int hv_flip = 0;



	ret = ov2680_read_reg(sensor, OV2680_REG_FORMAT2, &format2);

	if (ret < 0)

		return ret;

	if (sensor->ctrls.vflip && sensor->ctrls.vflip->val)

		hv_flip += 1;



	hv_flip = (format2 & BIT(2)  << 1) | (format1 & BIT(2));

	if (sensor->ctrls.hflip && sensor->ctrls.hflip->val)

		hv_flip += 2;



	sensor->fmt.code = ov2680_hv_flip_bayer_order[hv_flip];



	return 0;

}



static int ov2680_vflip_enable(struct ov2680_dev *sensor)
@@ -345,7 +336,8 @@ static int ov2680_vflip_enable(struct ov2680_dev *sensor) 
	if (ret < 0)

		return ret;



	return ov2680_bayer_order(sensor);

	ov2680_set_bayer_order(sensor);

	return 0;

}



static int ov2680_vflip_disable(struct ov2680_dev *sensor)
@@ -356,7 +348,8 @@ static int ov2680_vflip_disable(struct ov2680_dev *sensor) 
	if (ret < 0)

		return ret;



	return ov2680_bayer_order(sensor);

	ov2680_set_bayer_order(sensor);

	return 0;

}



static int ov2680_hflip_enable(struct ov2680_dev *sensor)
@@ -367,7 +360,8 @@ static int ov2680_hflip_enable(struct ov2680_dev *sensor) 
	if (ret < 0)

		return ret;



	return ov2680_bayer_order(sensor);

	ov2680_set_bayer_order(sensor);

	return 0;

}



static int ov2680_hflip_disable(struct ov2680_dev *sensor)
@@ -378,7 +372,8 @@ static int ov2680_hflip_disable(struct ov2680_dev *sensor) 
	if (ret < 0)

		return ret;



	return ov2680_bayer_order(sensor);

	ov2680_set_bayer_order(sensor);

	return 0;

}



static int ov2680_test_pattern_set(struct ov2680_dev *sensor, int value)