UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

firewire: core: combine a bit of repeated code 

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Stefan Richter 2010-02-21 17:56:42 +01:00
parent 6e95dea728
commit 64582298b9
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/firewire/core-cdev.c
View File

@ -1349,6 +1349,9 @@ static int dispatch_ioctl(struct client *client,
union ioctl_arg buffer; union ioctl_arg buffer;
int ret; int ret;
if (fw_device_is_shutdown(client->device))
return -ENODEV;
if (_IOC_TYPE(cmd) != '#' || if (_IOC_TYPE(cmd) != '#' ||
_IOC_NR(cmd) >= ARRAY_SIZE(ioctl_handlers)) _IOC_NR(cmd) >= ARRAY_SIZE(ioctl_handlers))
return -EINVAL; return -EINVAL;
@ -1375,24 +1378,14 @@ static int dispatch_ioctl(struct client *client,
static long fw_device_op_ioctl(struct file *file, static long fw_device_op_ioctl(struct file *file,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
struct client *client = file->private_data; return dispatch_ioctl(file->private_data, cmd, (void __user *)arg);
if (fw_device_is_shutdown(client->device))
return -ENODEV;
return dispatch_ioctl(client, cmd, (void __user *) arg);
} }
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
static long fw_device_op_compat_ioctl(struct file *file, static long fw_device_op_compat_ioctl(struct file *file,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
struct client *client = file->private_data; return dispatch_ioctl(file->private_data, cmd, compat_ptr(arg));
if (fw_device_is_shutdown(client->device))
return -ENODEV;
return dispatch_ioctl(client, cmd, compat_ptr(arg));
} }
#endif #endif