From 21444559b188e8b41b3ed0913f5a0c1517a2f9d6 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sun, 14 Nov 2010 11:17:00 -0300 Subject: [PATCH] --- yaml --- r: 223383 b: refs/heads/master c: ca2621963de3934613f8aa63e19c03b1751707ae h: refs/heads/master i: 223381: 3e2b2a79a68a9a8ac2820fd3dde0255b607a87d6 223379: 096f0e5e868fb35dc09373b3232e89d37a8e3dbb 223375: beefce2dad90aebb4438fa98d824c7e9313ff4c3 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/et61x251/et61x251_core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 72c6cc707e07..d2d25dd0f85f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: feecf93d6b16887bf7e12fcc604bfba9048b2fa5 +refs/heads/master: ca2621963de3934613f8aa63e19c03b1751707ae diff --git a/trunk/drivers/media/video/et61x251/et61x251_core.c b/trunk/drivers/media/video/et61x251/et61x251_core.c index a5cfc76b40b7..bb164099ea2c 100644 --- a/trunk/drivers/media/video/et61x251/et61x251_core.c +++ b/trunk/drivers/media/video/et61x251/et61x251_core.c @@ -2530,7 +2530,7 @@ static const struct v4l2_file_operations et61x251_fops = { .owner = THIS_MODULE, .open = et61x251_open, .release = et61x251_release, - .ioctl = et61x251_ioctl, + .unlocked_ioctl = et61x251_ioctl, .read = et61x251_read, .poll = et61x251_poll, .mmap = et61x251_mmap,