Skip to content

Commit

Permalink
firewire: core: combine a bit of repeated code
Browse files Browse the repository at this point in the history
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
  • Loading branch information
Stefan Richter committed Feb 24, 2010
1 parent 6e95dea commit 6458229
Showing 1 changed file with 5 additions and 12 deletions.
17 changes: 5 additions & 12 deletions drivers/firewire/core-cdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -1349,6 +1349,9 @@ static int dispatch_ioctl(struct client *client,
union ioctl_arg buffer;
int ret;

if (fw_device_is_shutdown(client->device))
return -ENODEV;

if (_IOC_TYPE(cmd) != '#' ||
_IOC_NR(cmd) >= ARRAY_SIZE(ioctl_handlers))
return -EINVAL;
Expand All @@ -1375,24 +1378,14 @@ static int dispatch_ioctl(struct client *client,
static long fw_device_op_ioctl(struct file *file,
unsigned int cmd, unsigned long arg)
{
struct client *client = file->private_data;

if (fw_device_is_shutdown(client->device))
return -ENODEV;

return dispatch_ioctl(client, cmd, (void __user *) arg);
return dispatch_ioctl(file->private_data, cmd, (void __user *)arg);
}

#ifdef CONFIG_COMPAT
static long fw_device_op_compat_ioctl(struct file *file,
unsigned int cmd, unsigned long arg)
{
struct client *client = file->private_data;

if (fw_device_is_shutdown(client->device))
return -ENODEV;

return dispatch_ioctl(client, cmd, compat_ptr(arg));
return dispatch_ioctl(file->private_data, cmd, compat_ptr(arg));
}
#endif

Expand Down

0 comments on commit 6458229

Please sign in to comment.