git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
isdn
/
hardware
/
eicon
/
mntfunc.c
diff --git
a/drivers/isdn/hardware/eicon/mntfunc.c
b/drivers/isdn/hardware/eicon/mntfunc.c
index
2949245
..
a564b75
100644
(file)
--- a/
drivers/isdn/hardware/eicon/mntfunc.c
+++ b/
drivers/isdn/hardware/eicon/mntfunc.c
@@
-1,4
+1,4
@@
-/* $Id: mntfunc.c,v 1.19.6.
2 2004/08/28 20:03:53
armin Exp $
+/* $Id: mntfunc.c,v 1.19.6.
4 2005/01/31 12:22:20
armin Exp $
*
* Driver for Eicon DIVA Server ISDN cards.
* Maint module
*
* Driver for Eicon DIVA Server ISDN cards.
* Maint module
@@
-187,7
+187,7
@@
int maint_read_write(void __user *buf, int count)
if (!mask) {
ret = diva_set_trace_filter (1, "*");
} else if (mask < sizeof(data)) {
if (!mask) {
ret = diva_set_trace_filter (1, "*");
} else if (mask < sizeof(data)) {
- if (
copy_from_user(
data, (char __user *)buf+12, mask)) {
+ if (
diva_os_copy_from_user(NULL,
data, (char __user *)buf+12, mask)) {
ret = -EFAULT;
} else {
ret = diva_set_trace_filter ((int)mask, data);
ret = -EFAULT;
} else {
ret = diva_set_trace_filter ((int)mask, data);
@@
-199,7
+199,7
@@
int maint_read_write(void __user *buf, int count)
case DITRACE_READ_SELECTIVE_TRACE_FILTER:
if ((ret = diva_get_trace_filter (sizeof(data), data)) > 0) {
case DITRACE_READ_SELECTIVE_TRACE_FILTER:
if ((ret = diva_get_trace_filter (sizeof(data), data)) > 0) {
- if (
copy_to_user (
buf, data, ret))
+ if (
diva_os_copy_to_user (NULL,
buf, data, ret))
ret = -EFAULT;
} else {
ret = -ENODEV;
ret = -EFAULT;
} else {
ret = -ENODEV;