git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
drivers
/
ieee1394
/
video1394.c
diff --git
a/drivers/ieee1394/video1394.c
b/drivers/ieee1394/video1394.c
index
06759b3
..
9d6facf
100644
(file)
--- a/
drivers/ieee1394/video1394.c
+++ b/
drivers/ieee1394/video1394.c
@@
-883,7
+883,7
@@
static int __video1394_ioctl(struct file *file,
v.channel);
}
- if (copy_to_user(
(void *)arg
, &v, sizeof(v))) {
+ if (copy_to_user(
argp
, &v, sizeof(v))) {
/* FIXME : free allocated dma resources */
return -EFAULT;
}