diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-09-13 11:24:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-09-13 11:24:25 -0400 |
| commit | b2315372eac9cd9f622c32a93e323cf6f0f03462 (patch) | |
| tree | 9e1faa7cdcddf5d90bec4fb9523742d4cce699a1 /drivers/video/intelfb/intelfbhw.c | |
| parent | 5326152fa182b0a16e4abf913ce403e3c7ab53b7 (diff) | |
| parent | c87ce65868bbf9bbea9c3f112ff8315302daf8f2 (diff) | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'drivers/video/intelfb/intelfbhw.c')
| -rw-r--r-- | drivers/video/intelfb/intelfbhw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c index 16bc8d75e36e..b21d0dec9283 100644 --- a/drivers/video/intelfb/intelfbhw.c +++ b/drivers/video/intelfb/intelfbhw.c | |||
| @@ -924,10 +924,10 @@ calc_pll_params(int index, int clock, u32 *retm1, u32 *retm2, u32 *retn, u32 *re | |||
| 924 | if (m > pll->max_m) | 924 | if (m > pll->max_m) |
| 925 | m = pll->max_m - 1; | 925 | m = pll->max_m - 1; |
| 926 | for (testm = m - 1; testm <= m; testm++) { | 926 | for (testm = m - 1; testm <= m; testm++) { |
| 927 | f_out = calc_vclock3(index, m, n, p); | 927 | f_out = calc_vclock3(index, testm, n, p); |
| 928 | if (splitm(index, testm, &m1, &m2)) { | 928 | if (splitm(index, testm, &m1, &m2)) { |
| 929 | WRN_MSG("cannot split m = %d\n", m); | 929 | WRN_MSG("cannot split m = %d\n", |
| 930 | n++; | 930 | testm); |
| 931 | continue; | 931 | continue; |
| 932 | } | 932 | } |
| 933 | if (clock > f_out) | 933 | if (clock > f_out) |