[media] em28xx: radio_fops should also use unlocked_ioctl [Linux 2.6.37]

This Linux kernel change "[media] em28xx: radio_fops should also use unlocked_ioctl" is included in the Linux 2.6.37 release. This change is authored by Hans Verkuil <hverkuil [at] xs4all.nl> on Sat Dec 18 09:59:51 2010 -0300. The commit for this change in Linux stable tree is 8fd0bda (patch).

[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 <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>

There are 2 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/media/video/em28xx/em28xx-video.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 908e3bc..2c30072 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -2377,7 +2377,7 @@ static int em28xx_v4l2_mmap(struct file *filp, struct vm_area_struct *vma)
    .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 = {

Leave a Reply

Your email address will not be published. Required fields are marked *