summaryrefslogtreecommitdiffstats
path: root/drivers/media/radio
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-11-14 13:48:24 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-01 23:10:08 +0100
commit725ea8cf1c1f5ba53177d20d2d2f6dbc139b643e (patch)
tree7e071b9650a893c47247b3bfd7651197fe7e47ab /drivers/media/radio
parent[media] tea5764: convert to unlocked_ioctl (diff)
downloadlinux-725ea8cf1c1f5ba53177d20d2d2f6dbc139b643e.tar.xz
linux-725ea8cf1c1f5ba53177d20d2d2f6dbc139b643e.zip
[media] si4713: convert to unlocked_ioctl
Convert ioctl to unlocked_ioctl. Note that for this driver the locking is done inside the sub-device. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/radio')
-rw-r--r--drivers/media/radio/radio-si4713.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/radio/radio-si4713.c b/drivers/media/radio/radio-si4713.c
index 6a435786b63d..3a84c3dcc04c 100644
--- a/drivers/media/radio/radio-si4713.c
+++ b/drivers/media/radio/radio-si4713.c
@@ -53,7 +53,8 @@ struct radio_si4713_device {
/* radio_si4713_fops - file operations interface */
static const struct v4l2_file_operations radio_si4713_fops = {
.owner = THIS_MODULE,
- .ioctl = video_ioctl2,
+ /* Note: locking is done at the subdev level in the i2c driver. */
+ .unlocked_ioctl = video_ioctl2,
};
/* Video4Linux Interface */