---

yaml --- r: 325431 b: refs/heads/master c: dc881f2 h: refs/heads/master i: 325429: fcef8ac 325427: 8499669 325423: 7dbc663 v: v3
git-mirror · Sep 19, 2012 · 9dda8b0 · 9dda8b0
1 parent b246620
commit 9dda8b0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0352b932be274d0d67b02f93fe94e30e57265f85
+refs/heads/master: dc881f294eb957bded69b5e7f2f72831e2d00ac4
diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/drivers/staging/comedi/comedi_fops.c
@@ -370,7 +370,8 @@ static int do_devconfig_ioctl(struct comedi_device *dev,
 			return -ENOMEM;
 
 		if (copy_from_user(aux_data,
-				   comedi_aux_data(it.options, 0), aux_len)) {
+				   (unsigned char __user *
+				    )comedi_aux_data(it.options, 0), aux_len)) {
 			vfree(aux_data);
 			return -EFAULT;
 		}