1 From 8fd0bda511406ef0e9dcce9be055d7ab931e92ba Mon Sep 17 00:00:00 2001
2 From: Hans Verkuil <hverkuil@xs4all.nl>
3 Date: Sat, 18 Dec 2010 09:59:51 -0300
4 Subject: [PATCH 52/66] [media] em28xx: radio_fops should also use unlocked_ioctl
6 em28xx uses core assisted locking, so it shouldn't use .ioctl.
7 The .ioctl callback was replaced by .unlocked_ioctl for video nodes,
8 but not for radio nodes. This is now corrected.
10 Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
11 Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 drivers/media/video/em28xx/em28xx-video.c | 2 +-
14 1 files changed, 1 insertions(+), 1 deletions(-)
16 diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
17 index 908e3bc..2c30072 100644
18 --- a/drivers/media/video/em28xx/em28xx-video.c
19 +++ b/drivers/media/video/em28xx/em28xx-video.c
20 @@ -2377,7 +2377,7 @@ static const struct v4l2_file_operations radio_fops = {
22 .open = em28xx_v4l2_open,
23 .release = em28xx_v4l2_close,
24 - .ioctl = video_ioctl2,
25 + .unlocked_ioctl = video_ioctl2,
28 static const struct v4l2_ioctl_ops radio_ioctl_ops = {