media: v4l2-compat-ioctl32.c: add capabilities field to, v4l2_input32
authorHans Verkuil <hverkuil@xs4all.nl>
Fri, 4 Aug 2017 11:25:06 +0000 (07:25 -0400)
committerBen Hutchings <ben@decadent.org.uk>
Sat, 3 Mar 2018 15:51:05 +0000 (15:51 +0000)
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>
[bwh: Backported to 3.2: adjust filename]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/media/video/v4l2-compat-ioctl32.c

index f3bfd3c..3aaaf29 100644 (file)
@@ -572,7 +572,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.