From 03857a5540b4b94c8aaf05ab4a97c49f28e7386d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 6 Oct 2013 02:05:56 +0200 Subject: Fix setting cpu frequence without sufficient privileges --- src/hardware.cpp | 2 +- src/tdepowersave.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hardware.cpp b/src/hardware.cpp index bb4f21f..e3b811a 100644 --- a/src/hardware.cpp +++ b/src/hardware.cpp @@ -1083,7 +1083,7 @@ bool HardwareInfo::setCPUFreq ( cpufreq_type cpufreq, int limit ) { } if (cpuFreqAllowed == 0) { - kdError() << "Could not set CPU Freq, this not the needed privileges." << endl; + kdError() << "Could not set CPU Freq - insufficient privileges." << endl; return false; } diff --git a/src/tdepowersave.cpp b/src/tdepowersave.cpp index 73b569d..c32701d 100644 --- a/src/tdepowersave.cpp +++ b/src/tdepowersave.cpp @@ -1889,7 +1889,7 @@ void tdepowersave::setSchemeSettings(){ } // --> set CPU Freq settings - if(hwinfo->supportCPUFreq()) { + if(hwinfo->supportCPUFreq() && hwinfo->isCpuFreqAllowed()) { hwinfo->setCPUFreq( settings->cpuFreqPolicy, settings->cpuFreqDynamicPerformance); } @@ -2326,7 +2326,7 @@ void tdepowersave::handleResumeSignal() { setAutoDimm(true); // reset the CPU Freq Policy ... for more see https://bugzilla.novell.com/show_bug.cgi?id=223164 - if(hwinfo->supportCPUFreq()) { + if(hwinfo->supportCPUFreq() && hwinfo->isCpuFreqAllowed()) { hwinfo->setCPUFreq( settings->cpuFreqPolicy, settings->cpuFreqDynamicPerformance ); } -- cgit v1.2.3