diff options
| author | Tom Rini <trini@konsulko.com> | 2018-08-30 10:15:03 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-08-30 10:15:03 -0400 |
| commit | 26b068280f83e44680356cd96ffcccb0a06b317e (patch) | |
| tree | 0b2958664f2128107e19f97c2a4e33544af09073 /drivers | |
| parent | 1b74e9ce50361bbcffad4cc0272895c7ef58b0a7 (diff) | |
| parent | 65186977ee06e0df9a9524fa4b6689af4efecac1 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-sh
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/renesas-sdhi.c | 2 | ||||
| -rw-r--r-- | drivers/pci/pci-rcar-gen2.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c index ecdb088ac4..f8dc5f57ce 100644 --- a/drivers/mmc/renesas-sdhi.c +++ b/drivers/mmc/renesas-sdhi.c @@ -374,7 +374,7 @@ static int renesas_sdhi_probe(struct udevice *dev) 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 cbaba1986a..d913d53f3c 100644 --- a/drivers/pci/pci-rcar-gen2.c +++ b/drivers/pci/pci-rcar-gen2.c @@ -97,7 +97,7 @@ static int rcar_gen2_pci_addr_valid(pci_dev_t d, uint offset) /* 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 */ |