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

Commit 4af85668 authored by Jean-Francois Moine's avatar Jean-Francois Moine Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (13448): gspca - main: Add a gspca flag for inactive controls. 



Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 7ce5c41d

drivers/media/video/gspca/gspca.c

+3 −0
Original line number Diff line number Diff line
@@ -1158,10 +1158,13 @@ static int vidioc_queryctrl(struct file *file, void *priv, 
		}

	} else {

		ctrls = get_ctrl(gspca_dev, id);

		i = ctrls - gspca_dev->sd_desc->ctrls;

	}

	if (ctrls == NULL)

		return -EINVAL;

	memcpy(q_ctrl, ctrls, sizeof *q_ctrl);

	if (gspca_dev->ctrl_inac & (1 << i))

		q_ctrl->flags |= V4L2_CTRL_FLAG_INACTIVE;

	return 0;

}

drivers/media/video/gspca/gspca.h

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ struct gspca_dev { 
	struct cam cam;				/* device information */

	const struct sd_desc *sd_desc;		/* subdriver description */

	unsigned ctrl_dis;		/* disabled controls (bit map) */

	unsigned ctrl_inac;		/* inactive controls (bit map) */



#define USB_BUF_SZ 64

	__u8 *usb_buf;				/* buffer for USB exchanges */