git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
video
/
uvc
/
uvc_ctrl.c
diff --git
a/drivers/media/video/uvc/uvc_ctrl.c
b/drivers/media/video/uvc/uvc_ctrl.c
index aa0720af07a0e78abadd83a2eb8d79ba55b3560e..27a79f087b15c565004f44f14631be68ff78b890 100644
(file)
--- a/
drivers/media/video/uvc/uvc_ctrl.c
+++ b/
drivers/media/video/uvc/uvc_ctrl.c
@@
-122,8
+122,8
@@
static struct uvc_control_info uvc_ctrls[] = {
.selector = UVC_PU_POWER_LINE_FREQUENCY_CONTROL,
.index = 10,
.size = 1,
.selector = UVC_PU_POWER_LINE_FREQUENCY_CONTROL,
.index = 10,
.size = 1,
- .flags = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_
RANGE
- | UVC_CONTROL_RESTORE,
+ .flags = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_
CUR
+ | UVC_CONTROL_
GET_DEF | UVC_CONTROL_
RESTORE,
},
{
.entity = UVC_GUID_UVC_PROCESSING,
},
{
.entity = UVC_GUID_UVC_PROCESSING,