From: Matti Aaltonen Date: Tue, 4 Jan 2011 11:29:37 +0000 (-0300) Subject: [media] V4L2: WL1273 FM Radio: Replace ioctl with unlocked_ioctl X-Git-Tag: v2.6.38-rc2~1^2~38 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=34b8fc8e683cbcbbe47806260ef5dc505915b45f;p=profile%2Fivi%2Fkernel-x86-ivi.git [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 Signed-off-by: Mauro Carvalho Chehab --- 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, };