diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 19:00:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 19:00:33 -0400 |
| commit | 1d345dac1f30af1cd9f3a1faa12f9f18f17f236e (patch) | |
| tree | 42a7deda7589edf704fe60dc262046755bd3f6a8 /drivers/cpufreq/cpufreq.c | |
| parent | fb395884576684ebb54b19b1054f4caed589d5f0 (diff) | |
| parent | 87c8a4433b608261a9becdb0ce2d2f2ed4b71d05 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers/cpufreq/cpufreq.c')
| -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 03b5fb2ddcf4..bf62dfe4976a 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c | |||
| @@ -521,7 +521,7 @@ static ssize_t show(struct kobject * kobj, struct attribute * attr ,char * buf) | |||
| 521 | policy = cpufreq_cpu_get(policy->cpu); | 521 | policy = cpufreq_cpu_get(policy->cpu); |
| 522 | if (!policy) | 522 | if (!policy) |
| 523 | return -EINVAL; | 523 | return -EINVAL; |
| 524 | ret = fattr->show ? fattr->show(policy,buf) : 0; | 524 | ret = fattr->show ? fattr->show(policy,buf) : -EIO; |
| 525 | cpufreq_cpu_put(policy); | 525 | cpufreq_cpu_put(policy); |
| 526 | return ret; | 526 | return ret; |
| 527 | } | 527 | } |
| @@ -535,7 +535,7 @@ static ssize_t store(struct kobject * kobj, struct attribute * attr, | |||
| 535 | policy = cpufreq_cpu_get(policy->cpu); | 535 | policy = cpufreq_cpu_get(policy->cpu); |
| 536 | if (!policy) | 536 | if (!policy) |
| 537 | return -EINVAL; | 537 | return -EINVAL; |
| 538 | ret = fattr->store ? fattr->store(policy,buf,count) : 0; | 538 | ret = fattr->store ? fattr->store(policy,buf,count) : -EIO; |
| 539 | cpufreq_cpu_put(policy); | 539 | cpufreq_cpu_put(policy); |
| 540 | return ret; | 540 | return ret; |
| 541 | } | 541 | } |