From d791042d45fdc57b665a6b074191966ec44db8fe Mon Sep 17 00:00:00 2001 From: "viro@ZenIV.linux.org.uk" Date: Fri, 9 Sep 2005 20:26:01 +0100 Subject: [PATCH] --- yaml --- r: 8270 b: refs/heads/master c: 21b29229086bcaf14c02b160c253095f3bb95f99 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ieee1394/video1394.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 48df3cefbef6..f135d5583609 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18fb9442576c79fc2f4bca1fd90c3aa4d1115e97 +refs/heads/master: 21b29229086bcaf14c02b160c253095f3bb95f99 diff --git a/trunk/drivers/ieee1394/video1394.c b/trunk/drivers/ieee1394/video1394.c index 06759b36afea..9d6facf2f78f 100644 --- a/trunk/drivers/ieee1394/video1394.c +++ b/trunk/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; }