From 7ccab04742620517254c2f5032a363385eda2ef9 Mon Sep 17 00:00:00 2001 From: William Wu Date: Wed, 31 Oct 2018 17:52:02 +0800 Subject: [PATCH] usb: gadget: add compat_ioctl This allows 32 bit owners of USB Class to make ioctls into a 64 bit kernel. Change-Id: Ia31b26147ab619f0673f94b6662eaf181a9eb5dd Signed-off-by: William Wu Signed-off-by: Frank Wang --- drivers/usb/gadget/function/f_accessory.c | 3 +++ drivers/usb/gadget/function/uvc_v4l2.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/drivers/usb/gadget/function/f_accessory.c b/drivers/usb/gadget/function/f_accessory.c index a9bd90612986..43bef97912d9 100644 --- a/drivers/usb/gadget/function/f_accessory.c +++ b/drivers/usb/gadget/function/f_accessory.c @@ -922,6 +922,9 @@ static const struct file_operations acc_fops = { .read = acc_read, .write = acc_write, .unlocked_ioctl = acc_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl = acc_ioctl, +#endif .open = acc_open, .release = acc_release, }; diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c index 4ca89eab6159..5d37f787f89d 100644 --- a/drivers/usb/gadget/function/uvc_v4l2.c +++ b/drivers/usb/gadget/function/uvc_v4l2.c @@ -354,6 +354,9 @@ const struct v4l2_file_operations uvc_v4l2_fops = { .open = uvc_v4l2_open, .release = uvc_v4l2_release, .unlocked_ioctl = video_ioctl2, +#ifdef CONFIG_COMPAT + .compat_ioctl32 = video_ioctl2, +#endif .mmap = uvc_v4l2_mmap, .poll = uvc_v4l2_poll, #ifndef CONFIG_MMU