diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-23 00:55:13 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-23 00:55:13 +0200 |
| commit | 4eb5178c9cc09295111b79a99183f555c51887b4 (patch) | |
| tree | 71b8b2446558c5175e82240c07a6fbe4916a1b93 /drivers/cpufreq/pmac64-cpufreq.c | |
| parent | b36f4be3de1b123d8601de062e7dbfc904f305fb (diff) | |
| parent | 5025d628c8659fbf939f929107bf76db81dcdfff (diff) | |
Merge back earlier 'pm-cpufreq' material.
Diffstat (limited to 'drivers/cpufreq/pmac64-cpufreq.c')
| -rw-r--r-- | drivers/cpufreq/pmac64-cpufreq.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/cpufreq/pmac64-cpufreq.c b/drivers/cpufreq/pmac64-cpufreq.c index 7ba423431cfe..b6850d97f0d5 100644 --- a/drivers/cpufreq/pmac64-cpufreq.c +++ b/drivers/cpufreq/pmac64-cpufreq.c @@ -371,7 +371,6 @@ static int g5_cpufreq_cpu_init(struct cpufreq_policy *policy) static struct cpufreq_driver g5_cpufreq_driver = { .name = "powermac", - .owner = THIS_MODULE, .flags = CPUFREQ_CONST_LOOPS, .init = g5_cpufreq_cpu_init, .verify = g5_cpufreq_verify, @@ -447,9 +446,8 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus) if (!shdr) goto bail_noprops; g5_fvt_table = (struct smu_sdbp_fvt *)&shdr[1]; - ssize = (shdr->len * sizeof(u32)) - - sizeof(struct smu_sdbp_header); - g5_fvt_count = ssize / sizeof(struct smu_sdbp_fvt); + ssize = (shdr->len * sizeof(u32)) - sizeof(*shdr); + g5_fvt_count = ssize / sizeof(*g5_fvt_table); g5_fvt_cur = 0; /* Sanity checking */ |