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

Commit aeaecaf8 authored by Mike Isely's avatar Mike Isely Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (10240): Fix obvious swapped names in v4l2_subdev logic 



The VIDIOC_QUERYCTRL command needs to actually do a queryctrl, not a
querymenu.  Similarly, the VIDIOC_QUERYMENU command needs to actually
do a querymenu not a queryctrl.

Signed-off-by: default avatarMike Isely <isely@pobox.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent db4b2d19

drivers/media/video/v4l2-subdev.c

+2 −2
Original line number Diff line number Diff line
@@ -28,13 +28,13 @@ int v4l2_subdev_command(struct v4l2_subdev *sd, unsigned cmd, void *arg) 
{

	switch (cmd) {

	case VIDIOC_QUERYCTRL:

		return v4l2_subdev_call(sd, core, querymenu, arg);

		return v4l2_subdev_call(sd, core, queryctrl, arg);

	case VIDIOC_G_CTRL:

		return v4l2_subdev_call(sd, core, g_ctrl, arg);

	case VIDIOC_S_CTRL:

		return v4l2_subdev_call(sd, core, s_ctrl, arg);

	case VIDIOC_QUERYMENU:

		return v4l2_subdev_call(sd, core, queryctrl, arg);

		return v4l2_subdev_call(sd, core, querymenu, arg);

	case VIDIOC_LOG_STATUS:

		return v4l2_subdev_call(sd, core, log_status);

	case VIDIOC_DBG_G_CHIP_IDENT: