diff --git a/src/mainboard/siemens/mc_ehl/variants/mc_ehl2/mainboard.c b/src/mainboard/siemens/mc_ehl/variants/mc_ehl2/mainboard.c
index ac3ab14eef..b3846196fc 100644
--- a/src/mainboard/siemens/mc_ehl/variants/mc_ehl2/mainboard.c
+++ b/src/mainboard/siemens/mc_ehl/variants/mc_ehl2/mainboard.c
@@ -42,22 +42,21 @@ void variant_mainboard_final(void)
 	dev = pcidev_path_on_root(PCH_DEVFN_SDCARD);
 	if (dev) {
 		struct resource *res = probe_resource(dev, PCI_BASE_ADDRESS_0);
-		if (!res)
-			return;
+		if (res) {
+			disable_sdr_modes(res);
 
-		disable_sdr_modes(res);
-
-		/* Use preset driver strength from preset value registers. */
-		clrsetbits16(res2mmio(res, HOSTCTRL2, 0), 0, HOSTCTRL2_PRESET);
+			/* Use preset driver strength from preset value
+			   registers. */
+			clrsetbits16(res2mmio(res, HOSTCTRL2, 0), 0,
+					HOSTCTRL2_PRESET);
+		}
 	}
 
 	dev = pcidev_path_on_root(PCH_DEVFN_EMMC);
 	if (dev) {
 		struct resource *res = probe_resource(dev, PCI_BASE_ADDRESS_0);
-		if (!res)
-			return;
-
-		disable_sdr_modes(res);
+		if (res)
+			disable_sdr_modes(res);
 	}
 }
 
diff --git a/src/mainboard/siemens/mc_ehl/variants/mc_ehl3/mainboard.c b/src/mainboard/siemens/mc_ehl/variants/mc_ehl3/mainboard.c
index d76ac036fb..c68ecdae0d 100644
--- a/src/mainboard/siemens/mc_ehl/variants/mc_ehl3/mainboard.c
+++ b/src/mainboard/siemens/mc_ehl/variants/mc_ehl3/mainboard.c
@@ -33,13 +33,14 @@ void variant_mainboard_final(void)
 	dev = pcidev_path_on_root(PCH_DEVFN_SDCARD);
 	if (dev) {
 		struct resource *res = probe_resource(dev, PCI_BASE_ADDRESS_0);
-		if (!res)
-			return;
+		if (res) {
+			disable_sdr_modes(res);
 
-		disable_sdr_modes(res);
-
-		/* Use preset driver strength from preset value registers. */
-		clrsetbits16(res2mmio(res, HOSTCTRL2, 0), 0, HOSTCTRL2_PRESET);
+			/* Use preset driver strength from preset value
+			   registers. */
+			clrsetbits16(res2mmio(res, HOSTCTRL2, 0), 0,
+					HOSTCTRL2_PRESET);
+		}
 	}
 }
 
diff --git a/src/mainboard/siemens/mc_ehl/variants/mc_ehl4/mainboard.c b/src/mainboard/siemens/mc_ehl/variants/mc_ehl4/mainboard.c
index 3ef72fda0c..64cb3f318c 100644
--- a/src/mainboard/siemens/mc_ehl/variants/mc_ehl4/mainboard.c
+++ b/src/mainboard/siemens/mc_ehl/variants/mc_ehl4/mainboard.c
@@ -32,12 +32,13 @@ void variant_mainboard_final(void)
 	dev = pcidev_path_on_root(PCH_DEVFN_SDCARD);
 	if (dev) {
 		struct resource *res = probe_resource(dev, PCI_BASE_ADDRESS_0);
-		if (!res)
-			return;
+		if (res) {
+			disable_sdr_modes(res);
 
-		disable_sdr_modes(res);
-
-		/* Use preset driver strength from preset value registers. */
-		clrsetbits16(res2mmio(res, HOSTCTRL2, 0), 0, HOSTCTRL2_PRESET);
+			/* Use preset driver strength from preset value
+			   registers. */
+			clrsetbits16(res2mmio(res, HOSTCTRL2, 0), 0,
+					HOSTCTRL2_PRESET);
+		}
 	}
 }
diff --git a/src/mainboard/siemens/mc_ehl/variants/mc_ehl5/mainboard.c b/src/mainboard/siemens/mc_ehl/variants/mc_ehl5/mainboard.c
index ac3ab14eef..b3846196fc 100644
--- a/src/mainboard/siemens/mc_ehl/variants/mc_ehl5/mainboard.c
+++ b/src/mainboard/siemens/mc_ehl/variants/mc_ehl5/mainboard.c
@@ -42,22 +42,21 @@ void variant_mainboard_final(void)
 	dev = pcidev_path_on_root(PCH_DEVFN_SDCARD);
 	if (dev) {
 		struct resource *res = probe_resource(dev, PCI_BASE_ADDRESS_0);
-		if (!res)
-			return;
+		if (res) {
+			disable_sdr_modes(res);
 
-		disable_sdr_modes(res);
-
-		/* Use preset driver strength from preset value registers. */
-		clrsetbits16(res2mmio(res, HOSTCTRL2, 0), 0, HOSTCTRL2_PRESET);
+			/* Use preset driver strength from preset value
+			   registers. */
+			clrsetbits16(res2mmio(res, HOSTCTRL2, 0), 0,
+					HOSTCTRL2_PRESET);
+		}
 	}
 
 	dev = pcidev_path_on_root(PCH_DEVFN_EMMC);
 	if (dev) {
 		struct resource *res = probe_resource(dev, PCI_BASE_ADDRESS_0);
-		if (!res)
-			return;
-
-		disable_sdr_modes(res);
+		if (res)
+			disable_sdr_modes(res);
 	}
 }