From: Hans Verkuil Date: Sat, 18 Dec 2010 12:59:51 +0000 (-0300) Subject: [media] em28xx: radio_fops should also use unlocked_ioctl X-Git-Tag: MMI-PSA29.97-13-9~21474^2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8fd0bda511406ef0e9dcce9be055d7ab931e92ba;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git [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 Signed-off-by: Mauro Carvalho Chehab --- 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 = {