summaryrefslogtreecommitdiff
path: root/include/linux/videodev2.h
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2012-04-17 08:41:58 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-04-19 11:11:33 -0300
commite245afe984b120704f15bc8d391fdb6cf96cfe0c (patch)
treecc59a7c51dcb11961bf67d113f6bc0a65b720e9b /include/linux/videodev2.h
parent52dbb57c2322d494116570cabee8d4c9658604d6 (diff)
downloadlinux-3.10-e245afe984b120704f15bc8d391fdb6cf96cfe0c.tar.gz
linux-3.10-e245afe984b120704f15bc8d391fdb6cf96cfe0c.tar.bz2
linux-3.10-e245afe984b120704f15bc8d391fdb6cf96cfe0c.zip
[media] videodev2.h: Fix VIDIOC_QUERYMENU ioctl regression
Fixes a regression in VIDIOC_QUERYMENU introduced when the __s64 value field was added to the union. On a 64-bit system this will change the size of this v4l2_querymenu structure from 44 to 48 bytes, thus breaking the ABI. By adding the packed attribute it is working again. Tested on both 64 and 32 bit systems. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Sakari Ailus <sakari.ailus@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/linux/videodev2.h')
-rw-r--r--include/linux/videodev2.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index e69cacc9e9e..5a09ac3f768 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -1176,7 +1176,7 @@ struct v4l2_querymenu {
__s64 value;
};
__u32 reserved;
-};
+} __attribute__ ((packed));
/* Control flags */
#define V4L2_CTRL_FLAG_DISABLED 0x0001