summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-12-15 00:37:12 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-15 00:37:12 +0300
commit1c00802d3f62769a88e46212fae6f38082d30731 (patch)
tree938139d7c78ac111fb7b7b43eabfa496e0dcc1c6 /drivers
parentdc99bf78238a7554578a319d8fd06655151121a3 (diff)
parente504b84805c574cf18d705c610c9e4a8f6e61017 (diff)
downloadlinux-1c00802d3f62769a88e46212fae6f38082d30731.tar.xz
Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6
* 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6: fbdev: Fix fb_find_nearest_mode refresh comparison
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/modedb.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c
index 0a4dbdc1693a..de450c1fb869 100644
--- a/drivers/video/modedb.c
+++ b/drivers/video/modedb.c
@@ -855,6 +855,7 @@ const struct fb_videomode *fb_find_nearest_mode(const struct fb_videomode *mode,
abs(cmode->yres - mode->yres);
if (diff > d) {
diff = d;
+ diff_refresh = abs(cmode->refresh - mode->refresh);
best = cmode;
} else if (diff == d) {
d = abs(cmode->refresh - mode->refresh);