summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatti Aaltonen <matti.j.aaltonen@nokia.com>2011-01-04 08:29:37 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-01-19 11:45:47 -0200
commit34b8fc8e683cbcbbe47806260ef5dc505915b45f (patch)
treefcfda6fb92c28256b761b0e9a5ca92a03991d33d
parenta3bc5e3304c9ba8e7504597026d9ca93784d1239 (diff)
downloadop-kernel-dev-34b8fc8e683cbcbbe47806260ef5dc505915b45f.zip
op-kernel-dev-34b8fc8e683cbcbbe47806260ef5dc505915b45f.tar.gz
[media] V4L2: WL1273 FM Radio: Replace ioctl with unlocked_ioctl
Use unlocked_ioctl in v4l2_file_operations. The locking is already in place. Signed-off-by: Matti J. Aaltonen <matti.j.aaltonen@nokia.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/radio/radio-wl1273.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c
index dd6bd36..7ecc8e6 100644
--- a/drivers/media/radio/radio-wl1273.c
+++ b/drivers/media/radio/radio-wl1273.c
@@ -1407,7 +1407,7 @@ static const struct v4l2_file_operations wl1273_fops = {
.read = wl1273_fm_fops_read,
.write = wl1273_fm_fops_write,
.poll = wl1273_fm_fops_poll,
- .ioctl = video_ioctl2,
+ .unlocked_ioctl = video_ioctl2,
.open = wl1273_fm_fops_open,
.release = wl1273_fm_fops_release,
};
OpenPOWER on IntegriCloud