From: Tom Rini <trini@konsulko.com>
Date: Mon, 19 Feb 2018 14:50:18 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-i2c
X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fu-boot.git;a=commitdiff_plain;h=60a53351fb1500a7657973ecc5a96f02e04ea48f;hp=3ffa5288c86e4cd97940313ad408da88db841826

Merge git://git.denx.de/u-boot-i2c
---

diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c
index 30bee0d52e..38bca89745 100644
--- a/drivers/i2c/mvtwsi.c
+++ b/drivers/i2c/mvtwsi.c
@@ -487,11 +487,14 @@ static uint __twsi_i2c_set_bus_speed(struct mvtwsi_registers *twsi,
 static void __twsi_i2c_init(struct mvtwsi_registers *twsi, int speed,
 			    int slaveadd, uint *actual_speed)
 {
+	uint tmp_speed;
+
 	/* Reset controller */
 	twsi_reset(twsi);
 	/* Set speed */
+	tmp_speed = __twsi_i2c_set_bus_speed(twsi, speed);
 	if (actual_speed)
-		*actual_speed = __twsi_i2c_set_bus_speed(twsi, speed);
+		*actual_speed = tmp_speed;
 	/* Set slave address; even though we don't use it */
 	writel(slaveadd, &twsi->slave_address);
 	writel(0, &twsi->xtnd_slave_addr);