summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-12-24 11:50:04 +0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-30 14:39:44 +0300
commitc6b6c75e206a4da19ff139ea6b34c80306ebbf06 (patch)
tree6b68971b4dacc606b6673e5bbc18c9fa4a09cb89
parent5c1a15a149504496b25ee3f681893cbe1647ba39 (diff)
downloadlinux-c6b6c75e206a4da19ff139ea6b34c80306ebbf06.tar.xz
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>
-rw-r--r--drivers/media/video/gspca/gspca.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index edb667028dfe..8b9f3bde5740 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