android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Jean-Francois Moine 2009-11-12 15:59:27 -03:00 committed by Mauro Carvalho Chehab
parent 7ce5c41db3
commit 4af8566858
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/video/gspca/gspca.c
View File

@ -1158,10 +1158,13 @@ static int vidioc_queryctrl(struct file *file, void *priv,
} }
} else { } else {
ctrls = get_ctrl(gspca_dev, id); ctrls = get_ctrl(gspca_dev, id);
i = ctrls - gspca_dev->sd_desc->ctrls;
} }
if (ctrls == NULL) if (ctrls == NULL)
return -EINVAL; return -EINVAL;
memcpy(q_ctrl, ctrls, sizeof *q_ctrl); memcpy(q_ctrl, ctrls, sizeof *q_ctrl);
if (gspca_dev->ctrl_inac & (1 << i))
q_ctrl->flags |= V4L2_CTRL_FLAG_INACTIVE;
return 0; return 0;
} }

1
drivers/media/video/gspca/gspca.h
View File

@ -143,6 +143,7 @@ struct gspca_dev {
struct cam cam; /* device information */ struct cam cam; /* device information */
const struct sd_desc *sd_desc; /* subdriver description */ const struct sd_desc *sd_desc; /* subdriver description */
unsigned ctrl_dis; /* disabled controls (bit map) */ unsigned ctrl_dis; /* disabled controls (bit map) */
unsigned ctrl_inac; /* inactive controls (bit map) */
#define USB_BUF_SZ 64 #define USB_BUF_SZ 64
__u8 *usb_buf; /* buffer for USB exchanges */ __u8 *usb_buf; /* buffer for USB exchanges */