diff options
author | 2017-12-18 09:08:05 +0100 | |
---|---|---|
committer | 2017-12-18 09:08:05 +0100 | |
commit | d9e3d899bc7a852d44b3305ed49799fbf090e756 (patch) | |
tree | f3a75cb5f60be908a4384bd9e7add08486d7d338 /tools/power/cpupower/bench/system.c | |
parent | usb: usbtest: Add TEST 29, toggle sync, Clear toggle between bulk writes (diff) | |
parent | Linux 4.15-rc4 (diff) | |
download | linux-d9e3d899bc7a852d44b3305ed49799fbf090e756.tar.gz linux-d9e3d899bc7a852d44b3305ed49799fbf090e756.tar.bz2 linux-d9e3d899bc7a852d44b3305ed49799fbf090e756.zip |
Merge 4.15-rc4 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/power/cpupower/bench/system.c')
-rw-r--r-- | tools/power/cpupower/bench/system.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/power/cpupower/bench/system.c b/tools/power/cpupower/bench/system.c index c25a74ae51ba..2bb3eef7d5c1 100644 --- a/tools/power/cpupower/bench/system.c +++ b/tools/power/cpupower/bench/system.c @@ -61,7 +61,7 @@ int set_cpufreq_governor(char *governor, unsigned int cpu) dprintf("set %s as cpufreq governor\n", governor); - if (cpupower_is_cpu_online(cpu) != 0) { + if (cpupower_is_cpu_online(cpu) != 1) { perror("cpufreq_cpu_exists"); fprintf(stderr, "error: cpu %u does not exist\n", cpu); return -1; |