diff --git a/drivers/ddr/altera/sequencer.c b/drivers/ddr/altera/sequencer.c
index 7384c16..5e3fec3 100644
--- a/drivers/ddr/altera/sequencer.c
+++ b/drivers/ddr/altera/sequencer.c
@@ -3419,17 +3419,19 @@
 		if (failing_groups != 0)
 			return 0;
 
+		if (STATIC_CALIB_STEPS & CALIB_SKIP_LFIFO)
+			continue;
+
+		/*
+		 * If we're skipping groups as part of debug,
+		 * don't calibrate LFIFO.
+		 */
+		if (param->skip_groups != 0)
+			continue;
+
 		/* Calibrate the LFIFO */
-		if (!((STATIC_CALIB_STEPS) & CALIB_SKIP_LFIFO)) {
-			/*
-			 * If we're skipping groups as part of debug,
-			 * don't calibrate LFIFO.
-			 */
-			if (param->skip_groups == 0) {
-				if (!rw_mgr_mem_calibrate_lfifo())
-					return 0;
-			}
-		}
+		if (!rw_mgr_mem_calibrate_lfifo())
+			return 0;
 	}
 
 	/*