Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6

[~andy/linux] / drivers / cpufreq / s3c2416-cpufreq.c

diff --git a/drivers/cpufreq/s3c2416-cpufreq.c b/drivers/cpufreq/s3c2416-cpufreq.c
index f1233143e3e3bf6fc1d5100f6e805da6b677dac4..ce5b9fca9c1871eed562add6fb35f3979ab7fd8a 100644 (file)
--- a/drivers/cpufreq/s3c2416-cpufreq.c
+++ b/drivers/cpufreq/s3c2416-cpufreq.c
@@ -205,7 +205,7 @@ static int s3c2416_cpufreq_leave_dvs(struct s3c2416_data *s3c_freq, int idx)
                ret = s3c2416_cpufreq_set_armdiv(s3c_freq,
                                        clk_get_rate(s3c_freq->hclk) / 1000);
                if (ret < 0) {
-                       pr_err("cpufreq: Failed to to set the armdiv to %lukHz: %d\n",
+                       pr_err("cpufreq: Failed to set the armdiv to %lukHz: %d\n",
                               clk_get_rate(s3c_freq->hclk) / 1000, ret);
                        return ret;
                }
@@ -244,7 +244,7 @@ static int s3c2416_cpufreq_set_target(struct cpufreq_policy *policy,
        if (ret != 0)
                goto out;
 
-       idx = s3c_freq->freq_table[i].index;
+       idx = s3c_freq->freq_table[i].driver_data;
 
        if (idx == SOURCE_HCLK)
                to_dvs = 1;