aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-03-28 09:38:29 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 12:43:44 -0300
commit3fd8ab30c1fe9118a13f4b55172067ee04ef7a67 (patch)
tree7fe82384e85c4dfd707525f4b9595b15e4c67535 /drivers
parentV4L/DVB (11255): dst_ca: fix compile warning. (diff)
downloadlinux-dev-3fd8ab30c1fe9118a13f4b55172067ee04ef7a67.tar.xz
linux-dev-3fd8ab30c1fe9118a13f4b55172067ee04ef7a67.zip
V4L/DVB (11256): dabusb: fix compile warning.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/dabusb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c
index 384da45807a0..ba3709bec3f0 100644
--- a/drivers/media/video/dabusb.c
+++ b/drivers/media/video/dabusb.c
@@ -675,7 +675,6 @@ static int dabusb_release (struct inode *inode, struct file *file)
static long dabusb_ioctl (struct file *file, unsigned int cmd, unsigned long arg)
{
- lock_kernel();
pdabusb_t s = (pdabusb_t) file->private_data;
pbulk_transfer_t pbulk;
int ret = 0;
@@ -683,6 +682,7 @@ static long dabusb_ioctl (struct file *file, unsigned int cmd, unsigned long arg
dbg("dabusb_ioctl");
+ lock_kernel();
if (s->remove_pending) {
unlock_kernel();
return -EIO;