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 */