leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

firewire: core: small clarifications in core-cdev

Browse Source 
Make a note on the seemingly unused linux/sched.h.
Rename an irritatingly named variable.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Stefan Richter 2010-07-29 09:31:56 +02:00
parent 69e61d0c07
commit ae2a976614
1 changed files with 6 additions and 6 deletions

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

@ -34,7 +34,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/sched.h> #include <linux/sched.h> /* required for linux/wait.h */
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/time.h> #include <linux/time.h>
@ -993,7 +993,7 @@ static int ioctl_queue_iso(struct client *client, union ioctl_arg *arg)
struct fw_cdev_queue_iso *a = &arg->queue_iso; struct fw_cdev_queue_iso *a = &arg->queue_iso;
struct fw_cdev_iso_packet __user *p, *end, *next; struct fw_cdev_iso_packet __user *p, *end, *next;
struct fw_iso_context *ctx = client->iso_context; struct fw_iso_context *ctx = client->iso_context;
unsigned long payload, buffer_end, header_length; unsigned long payload, buffer_end, transmit_header_bytes;
u32 control; u32 control;
int count; int count;
struct { struct {
@ -1042,7 +1042,7 @@ static int ioctl_queue_iso(struct client *client, union ioctl_arg *arg)
if (ctx->type == FW_ISO_CONTEXT_TRANSMIT) { if (ctx->type == FW_ISO_CONTEXT_TRANSMIT) {
if (u.packet.header_length % 4 != 0) if (u.packet.header_length % 4 != 0)
return -EINVAL; return -EINVAL;
header_length = u.packet.header_length; transmit_header_bytes = u.packet.header_length;
} else { } else {
/* /*
* We require that header_length is a multiple of * We require that header_length is a multiple of
@ -1051,15 +1051,15 @@ static int ioctl_queue_iso(struct client *client, union ioctl_arg *arg)
if (u.packet.header_length == 0 || if (u.packet.header_length == 0 ||
u.packet.header_length % ctx->header_size != 0) u.packet.header_length % ctx->header_size != 0)
return -EINVAL; return -EINVAL;
header_length = 0; transmit_header_bytes = 0;
} }
next = (struct fw_cdev_iso_packet __user *) next = (struct fw_cdev_iso_packet __user *)
&p->header[header_length / 4]; &p->header[transmit_header_bytes / 4];
if (next > end) if (next > end)
return -EINVAL; return -EINVAL;
if (__copy_from_user if (__copy_from_user
(u.packet.header, p->header, header_length)) (u.packet.header, p->header, transmit_header_bytes))
return -EFAULT; return -EFAULT;
if (u.packet.skip && ctx->type == FW_ISO_CONTEXT_TRANSMIT && if (u.packet.skip && ctx->type == FW_ISO_CONTEXT_TRANSMIT &&
u.packet.header_length + u.packet.payload_length > 0) u.packet.header_length + u.packet.payload_length > 0)