lkml.org 
[lkml]   [2018]   [Feb]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 238/254] media: v4l2-compat-ioctl32.c: add capabilities field to, v4l2_input32
    3.16.55-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Hans Verkuil <hverkuil@xs4all.nl>

    commit 037e0865c2ecbaa4558feba239ece08d7e457ec0 upstream.

    The v4l2_input32 struct wasn't updated when this field was added.
    It didn't cause a failure in the compat code, but it is better to
    keep it in sync with v4l2_input to avoid confusion.

    Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
    +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
    @@ -576,7 +576,8 @@ struct v4l2_input32 {
    __u32 tuner; /* Associated tuner */
    compat_u64 std;
    __u32 status;
    - __u32 reserved[4];
    + __u32 capabilities;
    + __u32 reserved[3];
    };

    /* The 64-bit v4l2_input struct has extra padding at the end of the struct.
    \
     
     \ /
      Last update: 2018-02-28 18:16    [W:4.022 / U:0.272 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site