Skip to content

Commit

Permalink
clocksource: Fix 'ret' data type of sysfs_override_clocksource() and …
Browse files Browse the repository at this point in the history
…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>
  • Loading branch information
Elad Wexler authored and John Stultz committed Sep 17, 2013
1 parent 389e067 commit 233bcb4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions kernel/time/clocksource.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 233bcb4

Please sign in to comment.