aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-03-28 08:38:29 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:43:44 -0400
commit3fd8ab30c1fe9118a13f4b55172067ee04ef7a67 (patch)
tree7fe82384e85c4dfd707525f4b9595b15e4c67535 /drivers/media
parentce18c48593746d6c6777bda2488f15c8ae401c9e (diff)
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/media')
-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)
675 675
676static long dabusb_ioctl (struct file *file, unsigned int cmd, unsigned long arg) 676static long dabusb_ioctl (struct file *file, unsigned int cmd, unsigned long arg)
677{ 677{
678 lock_kernel();
679 pdabusb_t s = (pdabusb_t) file->private_data; 678 pdabusb_t s = (pdabusb_t) file->private_data;
680 pbulk_transfer_t pbulk; 679 pbulk_transfer_t pbulk;
681 int ret = 0; 680 int ret = 0;
@@ -683,6 +682,7 @@ static long dabusb_ioctl (struct file *file, unsigned int cmd, unsigned long arg
683 682
684 dbg("dabusb_ioctl"); 683 dbg("dabusb_ioctl");
685 684
685 lock_kernel();
686 if (s->remove_pending) { 686 if (s->remove_pending) {
687 unlock_kernel(); 687 unlock_kernel();
688 return -EIO; 688 return -EIO;