diff options
| author | Stoyan Gaydarov <stoyboyker@gmail.com> | 2009-03-24 18:12:47 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 12:43:42 -0300 |
| commit | 5ed2b6419ef48efda66a71d4b26bd2fa6b6a1ac7 (patch) | |
| tree | 80a33b6bfaf2a620746cc4c547ff2c7b7a2f29d7 /drivers/media/video/dabusb.c | |
| parent | cea0213de7e2376041bc1997a2303b09e7d5aad0 (diff) | |
| download | op-kernel-dev-5ed2b6419ef48efda66a71d4b26bd2fa6b6a1ac7.zip op-kernel-dev-5ed2b6419ef48efda66a71d4b26bd2fa6b6a1ac7.tar.gz | |
V4L/DVB (11235): changed ioctls to unlocked
Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/dabusb.c')
| -rw-r--r-- | drivers/media/video/dabusb.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c index a525a92..384da45 100644 --- a/drivers/media/video/dabusb.c +++ b/drivers/media/video/dabusb.c @@ -673,8 +673,9 @@ static int dabusb_release (struct inode *inode, struct file *file) return 0; } -static int dabusb_ioctl (struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) +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; @@ -682,13 +683,16 @@ static int dabusb_ioctl (struct inode *inode, struct file *file, unsigned int cm dbg("dabusb_ioctl"); - if (s->remove_pending) + if (s->remove_pending) { + unlock_kernel(); return -EIO; + } mutex_lock(&s->mutex); if (!s->usbdev) { mutex_unlock(&s->mutex); + unlock_kernel(); return -EIO; } @@ -729,6 +733,7 @@ static int dabusb_ioctl (struct inode *inode, struct file *file, unsigned int cm break; } mutex_unlock(&s->mutex); + unlock_kernel(); return ret; } @@ -737,7 +742,7 @@ static const struct file_operations dabusb_fops = .owner = THIS_MODULE, .llseek = no_llseek, .read = dabusb_read, - .ioctl = dabusb_ioctl, + .unlocked_ioctl = dabusb_ioctl, .open = dabusb_open, .release = dabusb_release, }; |
