summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorAndrzej Hajda <a.hajda@samsung.com>2015-08-21 11:50:09 +0200
committerSeung-Woo Kim <sw0312.kim@samsung.com>2016-12-14 13:47:50 +0900
commit546feca0ea9ac9cac2df536ed546e9b4e2dc3f5a (patch)
tree8504b4654a3f2b00c844ee5cbaf84fa4b5fc1f4e /drivers/media
parent18f23fe3054393b4ec761a1b94d986dcb217465f (diff)
v4l2-compat-ioctl32: fix struct v4l2_event32 alignment
Union v4l2_event::u is aligned to 8 bytes on arm32. On arm64 v4l2_event32::u is aligned to 4 bytes. As a result structures v4l2_event and v4l2_event32 have different sizes and VIDOC_DQEVENT ioctl does not work from arm32 apps running on arm64 kernel. The patch fixes it. Signed-off-by: Andrzej Hajda <a.hajda@samsung.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/v4l2-core/v4l2-compat-ioctl32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
index 4b777be714a4..e51fb17c3c1b 100644
--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
@@ -735,7 +735,7 @@ struct v4l2_event32 {
__u32 type;
union {
__u8 data[64];
- } u;
+ } u __attribute__((aligned(8)));
__u32 pending;
__u32 sequence;
struct compat_timespec timestamp;