From: Jean-Francois Moine <moinejf@free.fr>
Date: Wed, 24 Dec 2008 08:50:04 +0000 (-0300)
Subject: V4L/DVB (9997): gspca - main: Don't lock the kernel on ioctl.
X-Git-Tag: v2.6.29-rc1~556^2~114
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c6b6c75e206a4da19ff139ea6b34c80306ebbf06;p=linux-2.6-omap-h63xx.git

V4L/DVB (9997): gspca - main: Don't lock the kernel on ioctl.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index edb667028df..8b9f3bde574 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -1808,7 +1808,7 @@ static struct file_operations dev_fops = {
 	.release = dev_close,
 	.read = dev_read,
 	.mmap = dev_mmap,
-	.ioctl = video_ioctl2,
+	.unlocked_ioctl = __video_ioctl2,
 #ifdef CONFIG_COMPAT
 	.compat_ioctl = v4l_compat_ioctl32,
 #endif