projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[cascardo/linux.git]
/
drivers
/
ieee1394
/
raw1394.c
diff --git
a/drivers/ieee1394/raw1394.c
b/drivers/ieee1394/raw1394.c
index
336e5ff
..
cadf047
100644
(file)
--- a/
drivers/ieee1394/raw1394.c
+++ b/
drivers/ieee1394/raw1394.c
@@
-2677,7
+2677,7
@@
static long raw1394_iso_xmit_recv_packets32(struct file *file, unsigned int cmd,
struct raw1394_iso_packets32 __user *arg)
{
compat_uptr_t infos32;
- void *infos;
+ void
__user
*infos;
long err = -EFAULT;
struct raw1394_iso_packets __user *dst = compat_alloc_user_space(sizeof(struct raw1394_iso_packets));