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

Commit ef66c0ca authored by Ricardo Ribalda Delgado's avatar Ricardo Ribalda Delgado Committed by Mauro Carvalho Chehab
Browse files

[media] media/v4l2-ctrls: Add execute flags to write_only controls 



Any control that sets FLAG_WRITE_ONLY should OR it with
FLAG_EXECUTE_ON_WRITE.

So we can keep the current meaning of WRITE_ONLY.

Signed-off-by: default avatarRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent b6e5b8f1

drivers/media/v4l2-core/v4l2-ctrls.c

+6 −3
Original line number Original line Diff line number Diff line
@@ -991,7 +991,8 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type, 
	case V4L2_CID_AUTO_FOCUS_START:

	case V4L2_CID_AUTO_FOCUS_START:

	case V4L2_CID_AUTO_FOCUS_STOP:

	case V4L2_CID_AUTO_FOCUS_STOP:

		*type = V4L2_CTRL_TYPE_BUTTON;

		*type = V4L2_CTRL_TYPE_BUTTON;

		*flags |= V4L2_CTRL_FLAG_WRITE_ONLY;

		*flags |= V4L2_CTRL_FLAG_WRITE_ONLY |

			  V4L2_CTRL_FLAG_EXECUTE_ON_WRITE;

		*min = *max = *step = *def = 0;

		*min = *max = *step = *def = 0;

		break;

		break;

	case V4L2_CID_POWER_LINE_FREQUENCY:

	case V4L2_CID_POWER_LINE_FREQUENCY:
@@ -1172,7 +1173,8 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type, 
	case V4L2_CID_FOCUS_RELATIVE:

	case V4L2_CID_FOCUS_RELATIVE:

	case V4L2_CID_IRIS_RELATIVE:

	case V4L2_CID_IRIS_RELATIVE:

	case V4L2_CID_ZOOM_RELATIVE:

	case V4L2_CID_ZOOM_RELATIVE:

		*flags |= V4L2_CTRL_FLAG_WRITE_ONLY;

		*flags |= V4L2_CTRL_FLAG_WRITE_ONLY |

			  V4L2_CTRL_FLAG_EXECUTE_ON_WRITE;

		break;

		break;

	case V4L2_CID_FLASH_STROBE_STATUS:

	case V4L2_CID_FLASH_STROBE_STATUS:

	case V4L2_CID_AUTO_FOCUS_STATUS:

	case V4L2_CID_AUTO_FOCUS_STATUS:
@@ -1983,7 +1985,8 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl, 




	sz_extra = 0;

	sz_extra = 0;

	if (type == V4L2_CTRL_TYPE_BUTTON)

	if (type == V4L2_CTRL_TYPE_BUTTON)

		flags |= V4L2_CTRL_FLAG_WRITE_ONLY;

		flags |= V4L2_CTRL_FLAG_WRITE_ONLY |

			V4L2_CTRL_FLAG_EXECUTE_ON_WRITE;

	else if (type == V4L2_CTRL_TYPE_CTRL_CLASS)

	else if (type == V4L2_CTRL_TYPE_CTRL_CLASS)

		flags |= V4L2_CTRL_FLAG_READ_ONLY;

		flags |= V4L2_CTRL_FLAG_READ_ONLY;

	else if (type == V4L2_CTRL_TYPE_INTEGER64 ||

	else if (type == V4L2_CTRL_TYPE_INTEGER64 ||