git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From f4eabafeb3ea41801260fba624cbf2da971d19f8 Mon Sep 17 00:00:00 2001
   2 From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
   3 Date: Thu, 6 Aug 2009 06:05:40 -0300
   4 Subject: V4L/DVB (13148): uvcvideo: Handle V4L2_CTRL_TYPE_BUTTON control type in VIDIOC_QUERYCTRL
   5
   6 From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
   7
   8 commit f4eabafeb3ea41801260fba624cbf2da971d19f8 upstream.
   9
  10 Return minimum, maximum and step set to 0 without querying the hardware.
  11
  12 Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  13 Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  14 Cc: maximilian attems <max@stro.at>
  15 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  16
  17 ---
  18  drivers/media/video/uvc/uvc_ctrl.c |    7 +++++++
  19  1 file changed, 7 insertions(+)
  20
  21 --- a/drivers/media/video/uvc/uvc_ctrl.c
  22 +++ b/drivers/media/video/uvc/uvc_ctrl.c
  23 @@ -826,6 +826,13 @@ int uvc_query_v4l2_ctrl(struct uvc_video
  24                 ret = 0;
  25                 goto out;
  26
  27 +       case V4L2_CTRL_TYPE_BUTTON:
  28 +               v4l2_ctrl->minimum = 0;
  29 +               v4l2_ctrl->maximum = 0;
  30 +               v4l2_ctrl->step = 0;
  31 +               ret = 0;
  32 +               goto out;
  33 +
  34         default:
  35                 break;
  36         }