Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

raw1394: fix whitespace after x86_64 compat patch

Browse source 
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Ben Collins <bcollins@ubuntu.com>
This commit is contained in:
Ben Collins 2006-06-12 18:12:10 -04:00
parent fa7614de60
commit 7597028a83
1 changed files with 26 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
drivers/ieee1394/raw1394.c
View file

@ -408,34 +408,34 @@ static void fcp_request(struct hpsb_host *host, int nodeid, int direction,
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
struct compat_raw1394_req { struct compat_raw1394_req {
__u32 type; __u32 type;
__s32 error; __s32 error;
__u32 misc; __u32 misc;
__u32 generation; __u32 generation;
__u32 length; __u32 length;
__u64 address; __u64 address;
__u64 tag; __u64 tag;
__u64 sendb; __u64 sendb;
__u64 recvb; __u64 recvb;
} __attribute__((packed)); } __attribute__((packed));
static const char __user *raw1394_compat_write(const char __user *buf) static const char __user *raw1394_compat_write(const char __user *buf)
{ {
struct compat_raw1394_req __user *cr = (typeof(cr)) buf; struct compat_raw1394_req __user *cr = (typeof(cr)) buf;
struct raw1394_request __user *r; struct raw1394_request __user *r;
r = compat_alloc_user_space(sizeof(struct raw1394_request)); r = compat_alloc_user_space(sizeof(struct raw1394_request));
#define C(x) __copy_in_user(&r->x, &cr->x, sizeof(r->x)) #define C(x) __copy_in_user(&r->x, &cr->x, sizeof(r->x))
if (copy_in_user(r, cr, sizeof(struct compat_raw1394_req)) || if (copy_in_user(r, cr, sizeof(struct compat_raw1394_req)) ||
C(address) || C(address) ||
C(tag) || C(tag) ||
C(sendb) || C(sendb) ||
C(recvb)) C(recvb))
return ERR_PTR(-EFAULT); return ERR_PTR(-EFAULT);
return (const char __user *)r; return (const char __user *)r;
} }
@ -443,11 +443,11 @@ static const char __user *raw1394_compat_write(const char __user *buf)
#define P(x) __put_user(r->x, &cr->x) #define P(x) __put_user(r->x, &cr->x)
static int static int
raw1394_compat_read(const char __user *buf, struct raw1394_request *r) raw1394_compat_read(const char __user *buf, struct raw1394_request *r)
{ {
struct compat_raw1394_req __user *cr = (typeof(cr)) r; struct compat_raw1394_req __user *cr = (typeof(cr)) r;
if (!access_ok(VERIFY_WRITE,cr,sizeof(struct compat_raw1394_req)) || if (!access_ok(VERIFY_WRITE, cr, sizeof(struct compat_raw1394_req)) ||
P(type) || P(type) ||
P(error) || P(error) ||
P(misc) || P(misc) ||
@ -512,18 +512,17 @@ static ssize_t raw1394_read(struct file *file, char __user * buffer,
} }
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
if (count == sizeof(struct compat_raw1394_req) && if (count == sizeof(struct compat_raw1394_req) &&
sizeof(struct compat_raw1394_req) != sizeof(struct compat_raw1394_req) !=
sizeof(struct raw1394_request)) { sizeof(struct raw1394_request)) {
ret = raw1394_compat_read(buffer, &req->req); ret = raw1394_compat_read(buffer, &req->req);
} else
} else
#endif #endif
{ {
if (copy_to_user(buffer, &req->req, sizeof(req->req))) { if (copy_to_user(buffer, &req->req, sizeof(req->req))) {
ret = -EFAULT; ret = -EFAULT;
goto out; goto out;
} }
ret = (ssize_t) sizeof(struct raw1394_request); ret = (ssize_t) sizeof(struct raw1394_request);
} }
out: out:
@ -2348,7 +2347,6 @@ static int state_connected(struct file_info *fi, struct pending_request *req)
return handle_async_request(fi, req, node); return handle_async_request(fi, req, node);
} }
static ssize_t raw1394_write(struct file *file, const char __user * buffer, static ssize_t raw1394_write(struct file *file, const char __user * buffer,
size_t count, loff_t * offset_is_ignored) size_t count, loff_t * offset_is_ignored)
{ {
@ -2357,9 +2355,9 @@ static ssize_t raw1394_write(struct file *file, const char __user * buffer,
ssize_t retval = 0; ssize_t retval = 0;
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
if (count == sizeof(struct compat_raw1394_req) && if (count == sizeof(struct compat_raw1394_req) &&
sizeof(struct compat_raw1394_req) != sizeof(struct compat_raw1394_req) !=
sizeof(struct raw1394_request)) { sizeof(struct raw1394_request)) {
buffer = raw1394_compat_write(buffer); buffer = raw1394_compat_write(buffer);
if (IS_ERR(buffer)) if (IS_ERR(buffer))
return PTR_ERR(buffer); return PTR_ERR(buffer);