From eb5788fe0efb86310dbe9d9a52e818591e110e3b Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 28 Mar 2018 15:12:36 -0300 Subject: [PATCH] media: v4l2-compat-ioctl32: use compat_u64 for video standard Instead of using the "v4l2_std_id" typedef, use compat_u64, as otherwise it fails to properly handle some ioctls. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman [sw0312.kim: cherry-pick from linux-3.18.y] Signed-off-by: Seung-Woo Kim Change-Id: I90b98df2c23d496133e7bd16a60f5150dba55624 --- drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c index 4b6c0a2bf5f..3e786d5cd95 100644 --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c @@ -688,7 +688,7 @@ struct v4l2_input32 { __u32 type; /* Type of input */ __u32 audioset; /* Associated audios (bitfield) */ __u32 tuner; /* Associated tuner */ - v4l2_std_id std; + compat_u64 std; __u32 status; __u32 capabilities; __u32 reserved[3]; -- 2.34.1