lkml.org 
[lkml]   [2009]   [Jun]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 033/108] V4L: ivtv/cx18: fix regression: class controls are no longer seen
    2.6.30-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Hans Verkuil <hverkuil@xs4all.nl>

    (cherry picked from commit c6711c3e6d4976716633047c0f6bbd953d6831fb)

    A previous change (v4l2-common: remove v4l2_ctrl_query_fill_std) broke
    the handling of class controls in VIDIOC_QUERYCTRL. The MPEG class control
    was broken for all drivers that use the cx2341x module and the USER class
    control was broken for ivtv and cx18.

    This change adds back proper class control support.

    Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/media/video/cx18/cx18-controls.c | 2 ++
    drivers/media/video/cx2341x.c | 2 ++
    drivers/media/video/ivtv/ivtv-controls.c | 2 ++
    3 files changed, 6 insertions(+)

    --- a/drivers/media/video/cx18/cx18-controls.c
    +++ b/drivers/media/video/cx18/cx18-controls.c
    @@ -61,6 +61,8 @@ int cx18_queryctrl(struct file *file, vo

    switch (qctrl->id) {
    /* Standard V4L2 controls */
    + case V4L2_CID_USER_CLASS:
    + return v4l2_ctrl_query_fill(qctrl, 0, 0, 0, 0);
    case V4L2_CID_BRIGHTNESS:
    case V4L2_CID_HUE:
    case V4L2_CID_SATURATION:
    --- a/drivers/media/video/cx2341x.c
    +++ b/drivers/media/video/cx2341x.c
    @@ -500,6 +500,8 @@ int cx2341x_ctrl_query(const struct cx23
    int err;

    switch (qctrl->id) {
    + case V4L2_CID_MPEG_CLASS:
    + return v4l2_ctrl_query_fill(qctrl, 0, 0, 0, 0);
    case V4L2_CID_MPEG_STREAM_TYPE:
    return v4l2_ctrl_query_fill(qctrl,
    V4L2_MPEG_STREAM_TYPE_MPEG2_PS,
    --- a/drivers/media/video/ivtv/ivtv-controls.c
    +++ b/drivers/media/video/ivtv/ivtv-controls.c
    @@ -60,6 +60,8 @@ int ivtv_queryctrl(struct file *file, vo

    switch (qctrl->id) {
    /* Standard V4L2 controls */
    + case V4L2_CID_USER_CLASS:
    + return v4l2_ctrl_query_fill(qctrl, 0, 0, 0, 0);
    case V4L2_CID_BRIGHTNESS:
    case V4L2_CID_HUE:
    case V4L2_CID_SATURATION:



    \
     
     \ /
      Last update: 2009-07-01 03:33    [W:4.292 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site