aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-12-18 09:59:51 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-01-03 09:52:25 -0200
commit8fd0bda511406ef0e9dcce9be055d7ab931e92ba (patch)
tree73f1e12e51ece5d1eef6c5ee2bb49dafeaa1ce3b /drivers/media/video
parent[media] wm8775: Revert changeset fcb9757333 to avoid a regression (diff)
downloadlinux-dev-8fd0bda511406ef0e9dcce9be055d7ab931e92ba.tar.xz
linux-dev-8fd0bda511406ef0e9dcce9be055d7ab931e92ba.zip
[media] em28xx: radio_fops should also use unlocked_ioctl
em28xx uses core assisted locking, so it shouldn't use .ioctl. The .ioctl callback was replaced by .unlocked_ioctl for video nodes, but not for radio nodes. This is now corrected. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/em28xx/em28xx-video.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 908e3bc88303..2c3007280032 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -2377,7 +2377,7 @@ static const struct v4l2_file_operations radio_fops = {
.owner = THIS_MODULE,
.open = em28xx_v4l2_open,
.release = em28xx_v4l2_close,
- .ioctl = video_ioctl2,
+ .unlocked_ioctl = video_ioctl2,
};
static const struct v4l2_ioctl_ops radio_ioctl_ops = {