diff --git a/arch/arm/mach-omap/omap4_generic.c b/arch/arm/mach-omap/omap4_generic.c
index 3d6ec25..7d71fdc 100644
--- a/arch/arm/mach-omap/omap4_generic.c
+++ b/arch/arm/mach-omap/omap4_generic.c
@@ -508,9 +508,9 @@
 
 	if (bootsrc & (1 << 5))
 		src = BOOTSOURCE_MMC;
-	if (bootsrc & (1 << 3))
+	else if (bootsrc & (1 << 3))
 		src = BOOTSOURCE_NAND;
-	if (bootsrc & (1<<20))
+	else if (bootsrc & (1<<20))
 		src = BOOTSOURCE_USB;
 	bootsource_set(src);
 	bootsource_set_instance(0);
diff --git a/drivers/pinctrl/imx-iomux-v3.c b/drivers/pinctrl/imx-iomux-v3.c
index 3ff3c15..c867a23 100644
--- a/drivers/pinctrl/imx-iomux-v3.c
+++ b/drivers/pinctrl/imx-iomux-v3.c
@@ -177,7 +177,7 @@
 	iomuxv3_base = dev_request_mem_region(dev, 0);
 	iomuxv3_dev = dev;
 
-	if (IS_ENABLED(CONFIG_PINCTRL))
+	if (IS_ENABLED(CONFIG_PINCTRL) && dev->device_node)
 		ret = imx_pinctrl_dt(dev, iomuxv3_base);
 
 	return ret;