diff --git a/src/northbridge/intel/x4x/dq_dqs.c b/src/northbridge/intel/x4x/dq_dqs.c
index afb7742..6045f3b 100644
--- a/src/northbridge/intel/x4x/dq_dqs.c
+++ b/src/northbridge/intel/x4x/dq_dqs.c
@@ -656,16 +656,13 @@
 				lane,
 				dq_sample[lane]);
 
-			if (dq_sample[lane] > 0) {
-				if (decrement_dq_dqs(s, &dqs_setting[lane])) {
-					printk(BIOS_EMERG,
-						"DQS setting channel%d, "
-						"lane %d reached a minimum!\n",
-						channel, lane);
-					return CB_ERR;
-				}
-			} else {
+			if (dq_sample[lane] == 0) {
 				bytelane_ok |= (1 << lane);
+			} else if (decrement_dq_dqs(s, &dqs_setting[lane])) {
+				printk(BIOS_EMERG,
+					"DQS setting channel%d, lane %d reached a minimum!\n",
+					channel, lane);
+				return CB_ERR;
 			}
 			dqsset(channel, lane, &dqs_setting[lane]);
 		}
@@ -695,14 +692,11 @@
 
 			if (dq_sample[lane] == N_SAMPLES) {
 				bytelane_ok |= (1 << lane);
-			} else {
-				if (increment_dq_dqs(s, &dqs_setting[lane])) {
-					printk(BIOS_EMERG,
-						"DQS setting channel%d, "
-						"lane %d reached a maximum!\n",
-						channel, lane);
-					return CB_ERR;
-				}
+			} else if (increment_dq_dqs(s, &dqs_setting[lane])) {
+				printk(BIOS_EMERG,
+					"DQS setting channel%d, lane %d reached a maximum!\n",
+					channel, lane);
+				return CB_ERR;
 			}
 			dqsset(channel, lane, &dqs_setting[lane]);
 		}