From 2766bac7465aaa80ff35d9e70a9206e3b58060ca Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 6 Jul 2012 11:21:49 +0300
Subject: [PATCH] --- yaml --- r: 317760 b: refs/heads/master c:
 a7f3943cd055f73e82e1b57468286f3d7cf9fb27 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/staging/vme/devices/vme_user.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7d8ec4616cab..18374127847f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e97e6c4f9a5d23a1bd7141b6fa73e2f96282c03d
+refs/heads/master: a7f3943cd055f73e82e1b57468286f3d7cf9fb27
diff --git a/trunk/drivers/staging/vme/devices/vme_user.c b/trunk/drivers/staging/vme/devices/vme_user.c
index e24a6f95db12..0c2479e41938 100644
--- a/trunk/drivers/staging/vme/devices/vme_user.c
+++ b/trunk/drivers/staging/vme/devices/vme_user.c
@@ -474,7 +474,7 @@ static int vme_user_ioctl(struct inode *inode, struct file *file,
 	case CONTROL_MINOR:
 		switch (cmd) {
 		case VME_IRQ_GEN:
-			copied = copy_from_user(&irq_req, (char *)arg,
+			copied = copy_from_user(&irq_req, argp,
 						sizeof(struct vme_irq_id));
 			if (copied != 0) {
 				printk(KERN_WARNING "Partial copy from userspace\n");