diff --git a/arch/risc-v/src/mpfs/mpfs_ddr.c b/arch/risc-v/src/mpfs/mpfs_ddr.c
index 884827a17f2..87121de1b6a 100644
--- a/arch/risc-v/src/mpfs/mpfs_ddr.c
+++ b/arch/risc-v/src/mpfs/mpfs_ddr.c
@@ -3997,6 +3997,11 @@ static int mpfs_ddr_setup(struct mpfs_ddr_priv_s *priv)
     }
   while (retval == -EAGAIN);
 
+  if (retval)
+    {
+      return retval;
+    }
+
   /* DDR_FULL_MTC_CHECK */
 
   retval = mpfs_training_full_mtc_test();