From 9dda8b0dcfdf06eeaf84733be31731b6060af866 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Tue, 18 Sep 2012 19:46:57 +0100 Subject: [PATCH] --- yaml --- r: 325431 b: refs/heads/master c: dc881f294eb957bded69b5e7f2f72831e2d00ac4 h: refs/heads/master i: 325429: fcef8ac646ced2bbc8df51d47738b021e1d996f0 325427: 8499669fad5eb530508e8cc442964e6181980d6e 325423: 7dbc663544e7f8d7183ee8c7637bdc3f72819f49 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedi_fops.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 972fa19ba0a4..7d8c0827a306 100644 --- 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 index 626fa723f199..9b9d4e8a2cf9 100644 --- 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; }