Commit fb59806b authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] eicon annotation

Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8088c0f2
...@@ -187,7 +187,7 @@ int maint_read_write(void __user *buf, int count) ...@@ -187,7 +187,7 @@ int maint_read_write(void __user *buf, int count)
if (!mask) { if (!mask) {
ret = diva_set_trace_filter (1, "*"); ret = diva_set_trace_filter (1, "*");
} else if (mask < sizeof(data)) { } else if (mask < sizeof(data)) {
if (copy_from_user((void *)&data[0], (void *)(((byte*)buf)+12), mask)) { if (copy_from_user(data, (char __user *)buf+12, mask)) {
ret = -EFAULT; ret = -EFAULT;
} else { } else {
ret = diva_set_trace_filter ((int)mask, data); ret = diva_set_trace_filter ((int)mask, data);
...@@ -199,7 +199,7 @@ int maint_read_write(void __user *buf, int count) ...@@ -199,7 +199,7 @@ int maint_read_write(void __user *buf, int count)
case DITRACE_READ_SELECTIVE_TRACE_FILTER: case DITRACE_READ_SELECTIVE_TRACE_FILTER:
if ((ret = diva_get_trace_filter (sizeof(data), data)) > 0) { if ((ret = diva_get_trace_filter (sizeof(data), data)) > 0) {
if (copy_to_user ((void*)buf, (void*)&data[0], ret)) if (copy_to_user (buf, data, ret))
ret = -EFAULT; ret = -EFAULT;
} else { } else {
ret = -ENODEV; ret = -ENODEV;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment