]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
[media] radio-bcm2048: use unlocked_ioctl instead of ioctl
authorHans Verkuil <hans.verkuil@cisco.com>
Tue, 17 Feb 2015 08:44:05 +0000 (05:44 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Mon, 2 Mar 2015 20:03:58 +0000 (17:03 -0300)
This driver does its own locking, so there is no need to use
ioctl instead of unlocked_ioctl.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/staging/media/bcm2048/radio-bcm2048.c

index 7f3d528b6309eb38bbd4a9ea49dde3be43bf2aad..297ceaa89b7c3a8171eae42ad3d661fc8c594c01 100644 (file)
@@ -2272,7 +2272,7 @@ static ssize_t bcm2048_fops_read(struct file *file, char __user *buf,
  */
 static const struct v4l2_file_operations bcm2048_fops = {
        .owner          = THIS_MODULE,
-       .ioctl          = video_ioctl2,
+       .unlocked_ioctl = video_ioctl2,
        /* for RDS read support */
        .open           = bcm2048_fops_open,
        .release        = bcm2048_fops_release,