summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-12-24 09:50:04 +0100
committerJean-Francois Moine <moinejf@free.fr>2008-12-24 09:50:04 +0100
commitea96a72d92acdc90a2f7f8cc2638e2061ca2846c (patch)
tree5556bd8943cf6936008b52cec1ba43d07540f2f4 /linux/drivers/media/video
parentac2c9fd519acfcea10f4b1b17b69e9f3d8f49555 (diff)
downloadmediapointer-dvb-s2-ea96a72d92acdc90a2f7f8cc2638e2061ca2846c.tar.gz
mediapointer-dvb-s2-ea96a72d92acdc90a2f7f8cc2638e2061ca2846c.tar.bz2
gspca - main: Don't lock the kernel on ioctl.
From: Jean-Francois Moine <moinejf@free.fr> Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/gspca/gspca.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/gspca/gspca.c b/linux/drivers/media/video/gspca/gspca.c
index 5d2f0ab93..5adbe7301 100644
--- a/linux/drivers/media/video/gspca/gspca.c
+++ b/linux/drivers/media/video/gspca/gspca.c
@@ -1818,7 +1818,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