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

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

media: ov2680: Fix vflip / hflip set functions 



[ Upstream commit d5d08ad330c9ccebc5e066fda815423a290f48b0 ]

ov2680_vflip_disable() / ov2680_hflip_disable() pass BIT(0) instead of
0 as value to ov2680_mod_reg().

While fixing this also:

1. Stop having separate enable/disable functions for hflip / vflip
2. Move the is_streaming check, which is unique to hflip / vflip
   into the ov2680_set_?flip() functions.

for a nice code cleanup.

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 560624cf

drivers/media/i2c/ov2680.c

+12 −38
Original line number Diff line number Diff line
@@ -328,23 +328,15 @@ static void ov2680_set_bayer_order(struct ov2680_dev *sensor) 
	sensor->fmt.code = ov2680_hv_flip_bayer_order[hv_flip];

}



static int ov2680_vflip_enable(struct ov2680_dev *sensor)

static int ov2680_set_vflip(struct ov2680_dev *sensor, s32 val)

{

	int ret;



	ret = ov2680_mod_reg(sensor, OV2680_REG_FORMAT1, BIT(2), BIT(2));

	if (ret < 0)

		return ret;



	ov2680_set_bayer_order(sensor);

	return 0;

}



static int ov2680_vflip_disable(struct ov2680_dev *sensor)

{

	int ret;

	if (sensor->is_streaming)

		return -EBUSY;



	ret = ov2680_mod_reg(sensor, OV2680_REG_FORMAT1, BIT(2), BIT(0));

	ret = ov2680_mod_reg(sensor, OV2680_REG_FORMAT1,

			     BIT(2), val ? BIT(2) : 0);

	if (ret < 0)

		return ret;
@@ -352,23 +344,15 @@ static int ov2680_vflip_disable(struct ov2680_dev *sensor) 
	return 0;

}



static int ov2680_hflip_enable(struct ov2680_dev *sensor)

static int ov2680_set_hflip(struct ov2680_dev *sensor, s32 val)

{

	int ret;



	ret = ov2680_mod_reg(sensor, OV2680_REG_FORMAT2, BIT(2), BIT(2));

	if (ret < 0)

		return ret;



	ov2680_set_bayer_order(sensor);

	return 0;

}



static int ov2680_hflip_disable(struct ov2680_dev *sensor)

{

	int ret;

	if (sensor->is_streaming)

		return -EBUSY;



	ret = ov2680_mod_reg(sensor, OV2680_REG_FORMAT2, BIT(2), BIT(0));

	ret = ov2680_mod_reg(sensor, OV2680_REG_FORMAT2,

			     BIT(2), val ? BIT(2) : 0);

	if (ret < 0)

		return ret;
@@ -721,19 +705,9 @@ static int ov2680_s_ctrl(struct v4l2_ctrl *ctrl) 
	case V4L2_CID_EXPOSURE:

		return ov2680_exposure_set(sensor, ctrl->val);

	case V4L2_CID_VFLIP:

		if (sensor->is_streaming)

			return -EBUSY;

		if (ctrl->val)

			return ov2680_vflip_enable(sensor);

		else

			return ov2680_vflip_disable(sensor);

		return ov2680_set_vflip(sensor, ctrl->val);

	case V4L2_CID_HFLIP:

		if (sensor->is_streaming)

			return -EBUSY;

		if (ctrl->val)

			return ov2680_hflip_enable(sensor);

		else

			return ov2680_hflip_disable(sensor);

		return ov2680_set_hflip(sensor, ctrl->val);

	case V4L2_CID_TEST_PATTERN:

		return ov2680_test_pattern_set(sensor, ctrl->val);

	default: