Commit eed6b2e7 authored by Akinobu Mita's avatar Akinobu Mita Committed by Mauro Carvalho Chehab
Browse files

media: ov7740: fix vertical flip control 



Setting the value of the V4L2_CID_VFLIP control is currently ignored.

Because V4L2_CID_HFLIP and V4L2_CID_VFLIP are independently controlled
in s_ctrl() but these controls belong to the same cluster and the first
control is V4L2_CID_HFLIP.

Fix it by not clustering these controls.  Also correct erroneous updating
register bit for vertical flip.

Cc: Wenyou Yang <wenyou.yang@microchip.com>
Cc: Eugen Hristev <eugen.hristev@microchip.com>
Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 6e4ab830

drivers/media/i2c/ov7740.c

+2 −2
Original line number Diff line number Diff line
@@ -532,7 +532,7 @@ static int ov7740_set_ctrl(struct v4l2_ctrl *ctrl) 
	struct i2c_client *client = v4l2_get_subdevdata(&ov7740->subdev);

	struct regmap *regmap = ov7740->regmap;

	int ret;

	u8 val = 0;

	u8 val;



	if (!pm_runtime_get_if_in_use(&client->dev))

		return 0;
@@ -551,6 +551,7 @@ static int ov7740_set_ctrl(struct v4l2_ctrl *ctrl) 
		ret = ov7740_set_contrast(regmap, ctrl->val);

		break;

	case V4L2_CID_VFLIP:

		val = ctrl->val ? REG0C_IMG_FLIP : 0x00;

		ret = regmap_update_bits(regmap, REG_REG0C,

					 REG0C_IMG_FLIP, val);

		break;
@@ -1030,7 +1031,6 @@ static int ov7740_init_controls(struct ov7740 *ov7740) 
	v4l2_ctrl_auto_cluster(2, &ov7740->auto_gain, 0, true);

	v4l2_ctrl_auto_cluster(2, &ov7740->auto_exposure,

			       V4L2_EXPOSURE_MANUAL, true);

	v4l2_ctrl_cluster(2, &ov7740->hflip);



	if (ctrl_hdlr->error) {

		ret = ctrl_hdlr->error;