Commit 4e318d7c authored by Andi Kleen's avatar Andi Kleen Committed by Greg Kroah-Hartman

sysfs: Fix return values for sysdev_store_{ulong,int}

SYSFS: Fix return values for sysdev_store_{ulong,int}

Always return the full size instead of the consumed
length of the string in sysdev_store_{ulong,int}

This avoids EINVAL errors in some echo versions.
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 65151365
...@@ -488,7 +488,8 @@ ssize_t sysdev_store_ulong(struct sys_device *sysdev, ...@@ -488,7 +488,8 @@ ssize_t sysdev_store_ulong(struct sys_device *sysdev,
if (end == buf) if (end == buf)
return -EINVAL; return -EINVAL;
*(unsigned long *)(ea->var) = new; *(unsigned long *)(ea->var) = new;
return end - buf; /* Always return full write size even if we didn't consume all */
return size;
} }
EXPORT_SYMBOL_GPL(sysdev_store_ulong); EXPORT_SYMBOL_GPL(sysdev_store_ulong);
...@@ -511,7 +512,8 @@ ssize_t sysdev_store_int(struct sys_device *sysdev, ...@@ -511,7 +512,8 @@ ssize_t sysdev_store_int(struct sys_device *sysdev,
if (end == buf || new > INT_MAX || new < INT_MIN) if (end == buf || new > INT_MAX || new < INT_MIN)
return -EINVAL; return -EINVAL;
*(int *)(ea->var) = new; *(int *)(ea->var) = new;
return end - buf; /* Always return full write size even if we didn't consume all */
return size;
} }
EXPORT_SYMBOL_GPL(sysdev_store_int); EXPORT_SYMBOL_GPL(sysdev_store_int);
......
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