diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-14 01:58:36 -0600 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-14 01:58:36 -0600 |
| commit | 2263aaefe6901d5e1bdae1553d404c94b1318b17 (patch) | |
| tree | 02590e21a8b3a1c96226e515ed2f92c2ee8c98d2 /linux | |
| parent | dd0e253f27d9fe533381467baf5c6be199712ed8 (diff) | |
| download | mediapointer-dvb-s2-2263aaefe6901d5e1bdae1553d404c94b1318b17.tar.gz mediapointer-dvb-s2-2263aaefe6901d5e1bdae1553d404c94b1318b17.tar.bz2 | |
Fix obvious swapped names in v4l2_subdev logic
From: Mike Isely <isely@pobox.com>
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.
Priority: high
Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/v4l2-subdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/v4l2-subdev.c b/linux/drivers/media/video/v4l2-subdev.c index 55a2e329a..158bc55de 100644 --- a/linux/drivers/media/video/v4l2-subdev.c +++ b/linux/drivers/media/video/v4l2-subdev.c @@ -28,7 +28,7 @@ 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: @@ -40,7 +40,7 @@ int v4l2_subdev_command(struct v4l2_subdev *sd, unsigned cmd, void *arg) case VIDIOC_TRY_EXT_CTRLS: return v4l2_subdev_call(sd, core, try_ext_ctrls, 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: |