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

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
...@@ -294,15 +294,6 @@ static int rcar_i2c_recv(struct rcar_i2c_priv *priv) ...@@ -294,15 +294,6 @@ static int rcar_i2c_recv(struct rcar_i2c_priv *priv)
static int rcar_i2c_send(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_set_addr(priv, 0);
rcar_i2c_status_clear(priv); rcar_i2c_status_clear(priv);
rcar_i2c_write(priv, ICMCR, RCAR_BUS_PHASE_START); rcar_i2c_write(priv, ICMCR, RCAR_BUS_PHASE_START);
...@@ -508,7 +499,10 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap, ...@@ -508,7 +499,10 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap,
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
/*-------------- spin unlock -----------------*/ /*-------------- spin unlock -----------------*/
ret = -EINVAL; ret = rcar_i2c_bus_barrier(priv);
if (ret < 0)
goto out;
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
/* This HW can't send STOP after address phase */ /* This HW can't send STOP after address phase */
if (msgs[i].len == 0) { if (msgs[i].len == 0) {
...@@ -569,7 +563,7 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap, ...@@ -569,7 +563,7 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap,
ret = i + 1; /* The number of transfer */ ret = i + 1; /* The number of transfer */
} }
out:
pm_runtime_put(dev); pm_runtime_put(dev);
if (ret < 0 && ret != -ENXIO) if (ret < 0 && ret != -ENXIO)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment