Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-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)
struct dvb_device* dvbdev = (struct dvb_device*) file->private_data;
struct dst_state* state = (struct dst_state*) dvbdev->priv;
struct ca_slot_info *p_ca_slot_info;
struct dvb_device* dvbdev = (struct dvb_device*) file->private_data;
struct dst_state* state = (struct dst_state*) dvbdev->priv;
struct ca_slot_info *p_ca_slot_info;
kfree (p_ca_slot_info);
kfree (p_ca_caps);
kfree (p_ca_slot_info);
kfree (p_ca_caps);
static const struct file_operations dst_ca_fops = {
.owner = THIS_MODULE,
static const struct file_operations dst_ca_fops = {
.owner = THIS_MODULE,
+ .unlocked_ioctl = dst_ca_ioctl,
.open = dst_ca_open,
.release = dst_ca_release,
.read = dst_ca_read,
.open = dst_ca_open,
.release = dst_ca_release,
.read = dst_ca_read,
-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)
pdabusb_t s = (pdabusb_t) file->private_data;
pbulk_transfer_t pbulk;
int ret = 0;
pdabusb_t s = (pdabusb_t) file->private_data;
pbulk_transfer_t pbulk;
int ret = 0;
+ if (s->remove_pending) {
+ unlock_kernel();
mutex_lock(&s->mutex);
if (!s->usbdev) {
mutex_unlock(&s->mutex);
mutex_lock(&s->mutex);
if (!s->usbdev) {
mutex_unlock(&s->mutex);
break;
}
mutex_unlock(&s->mutex);
break;
}
mutex_unlock(&s->mutex);
.owner = THIS_MODULE,
.llseek = no_llseek,
.read = dabusb_read,
.owner = THIS_MODULE,
.llseek = no_llseek,
.read = dabusb_read,
+ .unlocked_ioctl = dabusb_ioctl,
.open = dabusb_open,
.release = dabusb_release,
};
.open = dabusb_open,
.release = dabusb_release,
};