diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-17 00:15:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-17 00:15:42 -0400 |
commit | 0dd5198672dd2bbeb933862e1fc82162e0b636be (patch) | |
tree | c9efed20d90603c4d1626c21bd7aab1e7fc74a58 /drivers/media/video/cpia2/cpia2_v4l.c | |
parent | c868d550115b9ccc0027c67265b9520790f05601 (diff) | |
parent | 11c635a25b9f3a5d87409ce46cf2e05c500251ec (diff) |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (425 commits)
V4L/DVB (11870): gspca - main: VIDIOC_ENUM_FRAMESIZES ioctl added.
V4L/DVB (12004): poll method lose race condition
V4L/DVB (11894): flexcop-pci: dmesg visible names broken
V4L/DVB (11892): Siano: smsendian - declare function as extern
V4L/DVB (11891): Siano: smscore - bind the GPIO SMS protocol
V4L/DVB (11890): Siano: smscore - remove redundant code
V4L/DVB (11889): Siano: smsdvb - add DVB v3 events
V4L/DVB (11888): Siano: smsusb - remove redundant ifdef
V4L/DVB (11887): Siano: smscards - add board (target) events
V4L/DVB (11886): Siano: smscore - fix some new GPIO definitions names
V4L/DVB (11885): Siano: Add new GPIO management interface
V4L/DVB (11884): Siano: smssdio - revert to stand alone module
V4L/DVB (11883): Siano: cards - add two additional (USB) devices
V4L/DVB (11824): Siano: smsusb - change exit func debug msg
V4L/DVB (11823): Siano: smsusb - fix typo in module description
V4L/DVB (11822): Siano: smscore - bug fix at get_device_mode
V4L/DVB (11821): Siano: smscore - fix isdb-t firmware name
V4L/DVB (11820): Siano: smscore - fix byte ordering bug
V4L/DVB (11819): Siano: smscore - fix get_common_buffer bug
V4L/DVB (11818): Siano: smscards - assign gpio to HPG targets
...
Diffstat (limited to 'drivers/media/video/cpia2/cpia2_v4l.c')
-rw-r--r-- | drivers/media/video/cpia2/cpia2_v4l.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c index d4099f5312ac..0b4a8f309cfa 100644 --- a/drivers/media/video/cpia2/cpia2_v4l.c +++ b/drivers/media/video/cpia2/cpia2_v4l.c | |||
@@ -1064,7 +1064,7 @@ static int ioctl_querymenu(void *arg,struct camera_data *cam) | |||
1064 | 1064 | ||
1065 | switch(m->id) { | 1065 | switch(m->id) { |
1066 | case CPIA2_CID_FLICKER_MODE: | 1066 | case CPIA2_CID_FLICKER_MODE: |
1067 | if(m->index < 0 || m->index >= NUM_FLICKER_CONTROLS) | 1067 | if (m->index >= NUM_FLICKER_CONTROLS) |
1068 | return -EINVAL; | 1068 | return -EINVAL; |
1069 | 1069 | ||
1070 | strcpy(m->name, flicker_controls[m->index].name); | 1070 | strcpy(m->name, flicker_controls[m->index].name); |
@@ -1082,14 +1082,14 @@ static int ioctl_querymenu(void *arg,struct camera_data *cam) | |||
1082 | maximum = i; | 1082 | maximum = i; |
1083 | } | 1083 | } |
1084 | } | 1084 | } |
1085 | if(m->index < 0 || m->index > maximum) | 1085 | if (m->index > maximum) |
1086 | return -EINVAL; | 1086 | return -EINVAL; |
1087 | 1087 | ||
1088 | strcpy(m->name, framerate_controls[m->index].name); | 1088 | strcpy(m->name, framerate_controls[m->index].name); |
1089 | break; | 1089 | break; |
1090 | } | 1090 | } |
1091 | case CPIA2_CID_LIGHTS: | 1091 | case CPIA2_CID_LIGHTS: |
1092 | if(m->index < 0 || m->index >= NUM_LIGHTS_CONTROLS) | 1092 | if (m->index >= NUM_LIGHTS_CONTROLS) |
1093 | return -EINVAL; | 1093 | return -EINVAL; |
1094 | 1094 | ||
1095 | strcpy(m->name, lights_controls[m->index].name); | 1095 | strcpy(m->name, lights_controls[m->index].name); |