From 096f0e5e868fb35dc09373b3232e89d37a8e3dbb Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sun, 14 Nov 2010 09:48:24 -0300 Subject: [PATCH] --- yaml --- r: 223379 b: refs/heads/master c: 725ea8cf1c1f5ba53177d20d2d2f6dbc139b643e h: refs/heads/master i: 223377: ffbb7bf2fac72774ca9146b46c9db104b2a569c1 223375: beefce2dad90aebb4438fa98d824c7e9313ff4c3 v: v3 --- [refs] | 2 +- trunk/drivers/media/radio/radio-si4713.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9b7ea2d7e95c..3f6686a6a285 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee71e42321cced11fecb989d743ad9cdb0c384ea +refs/heads/master: 725ea8cf1c1f5ba53177d20d2d2f6dbc139b643e diff --git a/trunk/drivers/media/radio/radio-si4713.c b/trunk/drivers/media/radio/radio-si4713.c index 6a435786b63d..3a84c3dcc04c 100644 --- a/trunk/drivers/media/radio/radio-si4713.c +++ b/trunk/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 */