Merge branch 'master' of git://git.denx.de/u-boot-sh

Tom Rini
2 parents 1b74e9ce50 65186977ee
Showing 2 changed files Side-by-side Diff
drivers/mmc/renesas-sdhi.c
drivers/pci/pci-rcar-gen2.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;
 }
@@ -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 */
...	...	@@ -374,7 +374,7 @@
374	374	ret = tmio_sd_probe(dev, quirks);
375	375	#if CONFIG_IS_ENABLED(MMC_HS200_SUPPORT)
376	376	if (!ret)
377		- renesas_sdhi_reset_tuning(dev_get_priv(dev));
	377	+ renesas_sdhi_reset_tuning(priv);
378	378	#endif
379	379	return ret;
380	380	}
...	...	@@ -97,7 +97,7 @@
97	97
98	98	/* Only one EHCI/OHCI device built-in */
99	99	slot = PCI_DEV(d);
100		- if (slot > 2)
	100	+ if (slot != 1 && slot != 2)
101	101	return -EINVAL;
102	102
103	103	/* bridge logic only has registers to 0x40 */