diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-29 10:16:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-29 10:16:25 -0700 |
| commit | 33ac02aa4cef417871e128ab4a6565e751e5f3b2 (patch) | |
| tree | 000243cf3b1477eafb09d86207fdf199ec7f142b /drivers | |
| parent | e0d7ff168a71299919f01500b3d507aae0c67513 (diff) | |
| parent | 2bcad935a3bb149833bf249e6b159f22a90d6218 (diff) | |
| download | op-kernel-dev-33ac02aa4cef417871e128ab4a6565e751e5f3b2.zip op-kernel-dev-33ac02aa4cef417871e128ab4a6565e751e5f3b2.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/cpufreq/cpufreq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 7a7859d..10b0149 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1130,7 +1130,7 @@ int cpufreq_driver_target(struct cpufreq_policy *policy, unsigned int target_freq, unsigned int relation) { - unsigned int ret; + int ret; policy = cpufreq_cpu_get(policy->cpu); if (!policy) @@ -1151,7 +1151,7 @@ EXPORT_SYMBOL_GPL(cpufreq_driver_target); static int __cpufreq_governor(struct cpufreq_policy *policy, unsigned int event) { - int ret = -EINVAL; + int ret; if (!try_module_get(policy->governor->owner)) return -EINVAL; |
