Merge branch 'master' of git://git.denx.de/u-boot-sh
diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c
index ecdb088..f8dc5f5 100644
--- a/drivers/mmc/renesas-sdhi.c
+++ b/drivers/mmc/renesas-sdhi.c
@@ -374,7 +374,7 @@
ret = tmio_sd_probe(dev, quirks);
#if CONFIG_IS_ENABLED(MMC_HS200_SUPPORT)
if (!ret)
- renesas_sdhi_reset_tuning(dev_get_priv(dev));
+ renesas_sdhi_reset_tuning(priv);
#endif
return ret;
}
diff --git a/drivers/pci/pci-rcar-gen2.c b/drivers/pci/pci-rcar-gen2.c
index cbaba19..d913d53 100644
--- a/drivers/pci/pci-rcar-gen2.c
+++ b/drivers/pci/pci-rcar-gen2.c
@@ -97,7 +97,7 @@
/* Only one EHCI/OHCI device built-in */
slot = PCI_DEV(d);
- if (slot > 2)
+ if (slot != 1 && slot != 2)
return -EINVAL;
/* bridge logic only has registers to 0x40 */