From 4bfad12f7020fc01e4597a8c0dabee0e0160b965 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sun, 14 Nov 2010 11:13:39 -0300 Subject: [PATCH] --- yaml --- r: 223382 b: refs/heads/master c: feecf93d6b16887bf7e12fcc604bfba9048b2fa5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/sn9c102/sn9c102_core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e54973bc826a..72c6cc707e07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61df3c9b3fe6a7e47d25b27ae4df0ecdb07b8fbd +refs/heads/master: feecf93d6b16887bf7e12fcc604bfba9048b2fa5 diff --git a/trunk/drivers/media/video/sn9c102/sn9c102_core.c b/trunk/drivers/media/video/sn9c102/sn9c102_core.c index 28e19daadec9..f49fbfb7dc13 100644 --- a/trunk/drivers/media/video/sn9c102/sn9c102_core.c +++ b/trunk/drivers/media/video/sn9c102/sn9c102_core.c @@ -3238,7 +3238,7 @@ static const struct v4l2_file_operations sn9c102_fops = { .owner = THIS_MODULE, .open = sn9c102_open, .release = sn9c102_release, - .ioctl = sn9c102_ioctl, + .unlocked_ioctl = sn9c102_ioctl, .read = sn9c102_read, .poll = sn9c102_poll, .mmap = sn9c102_mmap,