From f282ec7eb88f3b2cdccf3bfd835ede1b8460e7b7 Mon Sep 17 00:00:00 2001 From: William Wu Date: Tue, 4 Jun 2019 19:44:34 +0800 Subject: [PATCH] Revert "media: v4l: increase the data length of v4l2_event" This reverts commit f61d7696159ec8af8ac7318f41c8bb9745f48584. Change-Id: Ie7fcd110323378012777b541f09cda7874f02a7f Signed-off-by: William Wu --- drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 4 ---- include/uapi/linux/videodev2.h | 4 ---- 2 files changed, 8 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c index bb3e1e96b6df..017ad89ceff5 100644 --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c @@ -913,11 +913,7 @@ struct v4l2_event32 { __u32 type; union { compat_s64 value64; -#ifdef CONFIG_USB_CONFIGFS_F_UVC_ROCKCHIP - __u8 data[4100]; -#else __u8 data[64]; -#endif } u; __u32 pending; __u32 sequence; diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 049b20b9ab15..e21c709f18ef 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -2153,11 +2153,7 @@ struct v4l2_event { struct v4l2_event_frame_sync frame_sync; struct v4l2_event_src_change src_change; struct v4l2_event_motion_det motion_det; -#ifdef CONFIG_USB_CONFIGFS_F_UVC_ROCKCHIP - __u8 data[4100]; -#else __u8 data[64]; -#endif } u; __u32 pending; __u32 sequence;