diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-10-05 12:52:27 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-10-05 12:52:27 -0400 |
| commit | 9514a56753a8d379db36bed424588e1842f2bfcc (patch) | |
| tree | d13cdfcd9473f521c3b108770dba57e81e557a30 /drivers/cpufreq/pcc-cpufreq.c | |
| parent | 4cd7f7a31178ff8a15ad2bc1258b9b2bf2cf51a4 (diff) | |
| parent | 6add6967a4a57e2156b96e62f28bcbe1901d16c1 (diff) | |
Merge branch 'for-grant' of git://git.jdl.com/software/linux-3.0 into devicetree/next
Diffstat (limited to 'drivers/cpufreq/pcc-cpufreq.c')
| -rw-r--r-- | drivers/cpufreq/pcc-cpufreq.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/cpufreq/pcc-cpufreq.c b/drivers/cpufreq/pcc-cpufreq.c index 7b0603eb0129..cdc02ac8f41a 100644 --- a/drivers/cpufreq/pcc-cpufreq.c +++ b/drivers/cpufreq/pcc-cpufreq.c | |||
| @@ -261,6 +261,9 @@ static int pcc_get_offset(int cpu) | |||
| 261 | pr = per_cpu(processors, cpu); | 261 | pr = per_cpu(processors, cpu); |
| 262 | pcc_cpu_data = per_cpu_ptr(pcc_cpu_info, cpu); | 262 | pcc_cpu_data = per_cpu_ptr(pcc_cpu_info, cpu); |
| 263 | 263 | ||
| 264 | if (!pr) | ||
| 265 | return -ENODEV; | ||
| 266 | |||
| 264 | status = acpi_evaluate_object(pr->handle, "PCCP", NULL, &buffer); | 267 | status = acpi_evaluate_object(pr->handle, "PCCP", NULL, &buffer); |
| 265 | if (ACPI_FAILURE(status)) | 268 | if (ACPI_FAILURE(status)) |
| 266 | return -ENODEV; | 269 | return -ENODEV; |