lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (11235): changed ioctls to unlocked

Browse Source 
Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Stoyan Gaydarov
2009-03-24 18:12:47 -03:00
committed by Mauro Carvalho Chehab
parent cea0213de7
commit 5ed2b6419e
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/dvb/bt8xx/dst_ca.c
View File

@@ -552,8 +552,10 @@ free_mem_and_exit:
return result; return result;
} }
static int dst_ca_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long ioctl_arg) static long dst_ca_ioctl(struct file *file, unsigned int cmd, unsigned long ioctl_arg)
{ {
lock_kernel();
struct dvb_device* dvbdev = (struct dvb_device*) file->private_data; struct dvb_device* dvbdev = (struct dvb_device*) file->private_data;
struct dst_state* state = (struct dst_state*) dvbdev->priv; struct dst_state* state = (struct dst_state*) dvbdev->priv;
struct ca_slot_info *p_ca_slot_info; struct ca_slot_info *p_ca_slot_info;
@@ -647,6 +649,7 @@ static int dst_ca_ioctl(struct inode *inode, struct file *file, unsigned int cmd
kfree (p_ca_slot_info); kfree (p_ca_slot_info);
kfree (p_ca_caps); kfree (p_ca_caps);
unlock_kernel();
return result; return result;
} }
@@ -684,7 +687,7 @@ static ssize_t dst_ca_write(struct file *file, const char __user *buffer, size_t
static const struct file_operations dst_ca_fops = { static const struct file_operations dst_ca_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.ioctl = dst_ca_ioctl, .unlocked_ioctl = dst_ca_ioctl,
.open = dst_ca_open, .open = dst_ca_open,
.release = dst_ca_release, .release = dst_ca_release,
.read = dst_ca_read, .read = dst_ca_read,

11
drivers/media/video/dabusb.c
View File

@@ -673,8 +673,9 @@ static int dabusb_release (struct inode *inode, struct file *file)
return 0; 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; pdabusb_t s = (pdabusb_t) file->private_data;
pbulk_transfer_t pbulk; pbulk_transfer_t pbulk;
int ret = 0; int ret = 0;
@@ -682,13 +683,16 @@ static int dabusb_ioctl (struct inode *inode, struct file *file, unsigned int cm
dbg("dabusb_ioctl"); dbg("dabusb_ioctl");
if (s->remove_pending) if (s->remove_pending) {
unlock_kernel();
return -EIO; return -EIO;
}
mutex_lock(&s->mutex); mutex_lock(&s->mutex);
if (!s->usbdev) { if (!s->usbdev) {
mutex_unlock(&s->mutex); mutex_unlock(&s->mutex);
unlock_kernel();
return -EIO; return -EIO;
} }
@@ -729,6 +733,7 @@ static int dabusb_ioctl (struct inode *inode, struct file *file, unsigned int cm
break; break;
} }
mutex_unlock(&s->mutex); mutex_unlock(&s->mutex);
unlock_kernel();
return ret; return ret;
} }
@@ -737,7 +742,7 @@ static const struct file_operations dabusb_fops =
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = no_llseek, .llseek = no_llseek,
.read = dabusb_read, .read = dabusb_read,
.ioctl = dabusb_ioctl, .unlocked_ioctl = dabusb_ioctl,
.open = dabusb_open, .open = dabusb_open,
.release = dabusb_release, .release = dabusb_release,
}; };