diff options
| author | John Stultz <john.stultz@linaro.org> | 2014-01-02 20:11:06 -0800 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2014-01-02 20:11:06 -0800 |
| commit | 3de283fd5a5a1db9ea3d97da3825cddcedc9a9bb (patch) | |
| tree | 1d5b6f3cb2d412782050d5e64f8e290a93ae3515 /drivers/cpufreq | |
| parent | c240c24f343f6e2b919bdfc1ee4f1d2ba6b07d79 (diff) | |
| parent | 0715d10b9e6c04327adb189e13ecd6a3c2df48ce (diff) | |
Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/cpufreq_interactive.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cpufreq/cpufreq_interactive.c b/drivers/cpufreq/cpufreq_interactive.c index d72e8c458f6..9f63bd1e4fe 100644 --- a/drivers/cpufreq/cpufreq_interactive.c +++ b/drivers/cpufreq/cpufreq_interactive.c @@ -752,7 +752,7 @@ static ssize_t show_target_loads( ret += sprintf(buf + ret, "%u%s", tunables->target_loads[i], i & 0x1 ? ":" : " "); - ret += sprintf(buf + --ret, "\n"); + sprintf(buf + ret - 1, "\n"); spin_unlock_irqrestore(&tunables->target_loads_lock, flags); return ret; } @@ -792,7 +792,7 @@ static ssize_t show_above_hispeed_delay( tunables->above_hispeed_delay[i], i & 0x1 ? ":" : " "); - ret += sprintf(buf + --ret, "\n"); + sprintf(buf + ret - 1, "\n"); spin_unlock_irqrestore(&tunables->above_hispeed_delay_lock, flags); return ret; } |