summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2015-02-17 05:44:05 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-03-02 17:03:58 -0300
commit2e1328dd5a8fd1fa98bf8fca49c5e6df61797a99 (patch)
tree8c3ca32aee3c70470580179c6925b0fe7dd667f3
parentab91c61129a7ef5b584d68670dcf8ca93d3611e5 (diff)
downloadop-kernel-dev-2e1328dd5a8fd1fa98bf8fca49c5e6df61797a99.zip
op-kernel-dev-2e1328dd5a8fd1fa98bf8fca49c5e6df61797a99.tar.gz
[media] radio-bcm2048: use unlocked_ioctl instead of ioctl
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>
-rw-r--r--drivers/staging/media/bcm2048/radio-bcm2048.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/media/bcm2048/radio-bcm2048.c b/drivers/staging/media/bcm2048/radio-bcm2048.c
index 7f3d528..297ceaa 100644
--- a/drivers/staging/media/bcm2048/radio-bcm2048.c
+++ b/drivers/staging/media/bcm2048/radio-bcm2048.c
@@ -2272,7 +2272,7 @@ done:
*/
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,
OpenPOWER on IntegriCloud