Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f7de22e authored by Wolfram Sang's avatar Wolfram Sang Committed by Wolfram Sang
Browse files

i2c: rcar: check bus free before first message 



We should always check if the bus is free, independently if it is a read
or write. It should be done before the first message, though. After
that, we ourselves keep the bus busy. Remove a 'ret' assignment which
only silenced a build warning.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent f2382249

drivers/i2c/busses/i2c-rcar.c

+5 −11
Original line number Diff line number Diff line
@@ -294,15 +294,6 @@ static int rcar_i2c_recv(struct rcar_i2c_priv *priv) 


static int rcar_i2c_send(struct rcar_i2c_priv *priv)

{

	int ret;



	/*

	 * It should check bus status when send case

	 */

	ret = rcar_i2c_bus_barrier(priv);

	if (ret < 0)

		return ret;



	rcar_i2c_set_addr(priv, 0);

	rcar_i2c_status_clear(priv);

	rcar_i2c_write(priv, ICMCR, RCAR_BUS_PHASE_START);
@@ -508,7 +499,10 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap, 
	spin_unlock_irqrestore(&priv->lock, flags);

	/*-------------- spin unlock -----------------*/



	ret = -EINVAL;

	ret = rcar_i2c_bus_barrier(priv);

	if (ret < 0)

		goto out;



	for (i = 0; i < num; i++) {

		/* This HW can't send STOP after address phase */

		if (msgs[i].len == 0) {
@@ -569,7 +563,7 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap, 


		ret = i + 1; /* The number of transfer */

	}



out:

	pm_runtime_put(dev);



	if (ret < 0 && ret != -ENXIO)