From 38eb695b2618b3fa9553254761cd8a1a94018906 Mon Sep 17 00:00:00 2001
From: Roel Kluin <roel.kluin@gmail.com>
Date: Tue, 22 Sep 2009 16:47:07 -0700
Subject: [PATCH] --- yaml --- r: 164847 b: refs/heads/master c:
 d63870db3c41086d7f13ec8b41def4331db32327 h: refs/heads/master i:   164845:
 690e5c55f38517f030c3c79999266efc172aba46   164843:
 436f6bc621eea20c8778e6bf7b2a0930c1aa0ccd   164839:
 a21340c323c69f1cb517c1d30161ea66d460c27f   164831:
 efe95cb5f58d3c2441cb2b722d0622beabaa9ef1 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/video/sis/sis_main.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 54d4b78b325d..478fb180c1e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f93e8f4822fdd48fa9c4c901eea87ab1c902f87
+refs/heads/master: d63870db3c41086d7f13ec8b41def4331db32327
diff --git a/trunk/drivers/video/sis/sis_main.c b/trunk/drivers/video/sis/sis_main.c
index 4a067f0d0ceb..a4e05e4d7501 100644
--- a/trunk/drivers/video/sis/sis_main.c
+++ b/trunk/drivers/video/sis/sis_main.c
@@ -698,8 +698,8 @@ sisfb_search_refresh_rate(struct sis_video_info *ivideo, unsigned int rate, int
 						rate, sisfb_vrate[i].refresh);
 					ivideo->rate_idx = sisfb_vrate[i].idx;
 					ivideo->refresh_rate = sisfb_vrate[i].refresh;
-				} else if(((rate - sisfb_vrate[i-1].refresh) <= 2)
-						&& (sisfb_vrate[i].idx != 1)) {
+				} else if((sisfb_vrate[i].idx != 1) &&
+						((rate - sisfb_vrate[i-1].refresh) <= 2)) {
 					DPRINTK("sisfb: Adjusting rate from %d down to %d\n",
 						rate, sisfb_vrate[i-1].refresh);
 					ivideo->rate_idx = sisfb_vrate[i-1].idx;