Commit 233bcb41 authored Sep 12, 2013 by Elad Wexler Committed by John Stultz Sep 17, 2013

clocksource: Fix 'ret' data type of sysfs_override_clocksource() and sysfs_unbind_clocksource()



sysfs_override_clocksource(): The expression 'if (ret >= 0)' is always true.
This will cause clocksource_select() to always run.
Thus modified ret to be of type ssize_t.

sysfs_unbind_clocksource(): The expression 'if (ret < 0)' is always false.
So in case sysfs_get_uname() failed, the expression won't take an effect.
Thus modified ret to be of type ssize_t.

Signed-off-by: Elad Wexler <elad.wexler@gmail.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>

parent 389e0670

kernel/time/clocksource.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -940,7 +940,7 @@ static ssize_t sysfs_override_clocksource(struct device *dev,
		struct device_attribute *attr,
		const char *buf, size_t count)
		{
		size_t ret;
		ssize_t ret;

		mutex_lock(&clocksource_mutex);

		@@ -968,7 +968,7 @@ static ssize_t sysfs_unbind_clocksource(struct device *dev,
		{
		struct clocksource *cs;
		char name[CS_NAME_LEN];
		size_t ret;
		ssize_t ret;

		ret = sysfs_get_uname(buf, name, count);
		if (ret < 0)