[PATCH] ARM: Remove nmi_tick from integrator platforms

[linux-2.6] / kernel / params.c

diff --git a/kernel/params.c b/kernel/params.c
index 5538608bd339b8ab81f1ea31d0cfc4797d19c84d..d586c35ef8fca8f4540031c5ad071b90c1071df4 100644 (file)
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -314,9 +314,10 @@ int param_array(const char *name,
 int param_array_set(const char *val, struct kernel_param *kp)
 {
        struct kparam_array *arr = kp->arg;
+       unsigned int temp_num;
 
        return param_array(kp->name, val, 1, arr->max, arr->elem,
-                          arr->elemsize, arr->set, arr->num ?: &arr->max);
+                          arr->elemsize, arr->set, arr->num ?: &temp_num);
 }
 
 int param_array_get(char *buffer, struct kernel_param *kp)
@@ -628,7 +629,7 @@ static ssize_t module_attr_show(struct kobject *kobj,
        mk = to_module_kobject(kobj);
 
        if (!attribute->show)
-               return -EPERM;
+               return -EIO;
 
        if (!try_module_get(mk->mod))
                return -ENODEV;
@@ -652,7 +653,7 @@ static ssize_t module_attr_store(struct kobject *kobj,
        mk = to_module_kobject(kobj);
 
        if (!attribute->store)
-               return -EPERM;
+               return -EIO;
 
        if (!try_module_get(mk->mod))
                return -ENODEV;