lkml.org 
[lkml]   [2011]   [Aug]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[02/50] [media] v4l2-ioctl.c: prefill tuner type for g_frequency and g/s_tuner
    2.6.33-longterm review patch.  If anyone has any objections, please let us know.

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

    From: Hans Verkuil <hans.verkuil@cisco.com>

    commit 227690df75382e46a4f6ea1bbc5df855a674b47f upstream.

    The subdevs are supposed to receive a valid tuner type for the g_frequency
    and g/s_tuner subdev ops. Some drivers do this, others don't. So prefill
    this in v4l2-ioctl.c based on whether the device node from which this is
    called is a radio node or not.

    The spec does not require applications to fill in the type, and if they
    leave it at 0 then the 'check_mode' call in tuner-core.c will return
    an error and the ioctl does nothing.

    Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/media/video/v4l2-ioctl.c | 6 ++++++
    1 file changed, 6 insertions(+)

    --- a/drivers/media/video/v4l2-ioctl.c
    +++ b/drivers/media/video/v4l2-ioctl.c
    @@ -1632,6 +1632,8 @@ static long __video_do_ioctl(struct file
    if (!ops->vidioc_g_tuner)
    break;

    + p->type = (vfd->vfl_type == VFL_TYPE_RADIO) ?
    + V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
    ret = ops->vidioc_g_tuner(file, fh, p);
    if (!ret)
    dbgarg(cmd, "index=%d, name=%s, type=%d, "
    @@ -1650,6 +1652,8 @@ static long __video_do_ioctl(struct file

    if (!ops->vidioc_s_tuner)
    break;
    + p->type = (vfd->vfl_type == VFL_TYPE_RADIO) ?
    + V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
    dbgarg(cmd, "index=%d, name=%s, type=%d, "
    "capability=0x%x, rangelow=%d, "
    "rangehigh=%d, signal=%d, afc=%d, "
    @@ -1668,6 +1672,8 @@ static long __video_do_ioctl(struct file
    if (!ops->vidioc_g_frequency)
    break;

    + p->type = (vfd->vfl_type == VFL_TYPE_RADIO) ?
    + V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
    ret = ops->vidioc_g_frequency(file, fh, p);
    if (!ret)
    dbgarg(cmd, "tuner=%d, type=%d, frequency=%d\n",



    \
     
     \ /
      Last update: 2011-08-06 02:23    [W:0.021 / U:59.272 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site