i2c: fsl_i2c: i2c_read(): dont try to write address w/ alen=0

[people/ms/u-boot.git] / drivers / i2c / fsl_i2c.c

diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c
index 5b017a910cd7bbfd919cb5c3d8033a568302f91e..5d7e010319729a2cb4cb96cccbfd5d742db4d467 100644 (file)
--- a/drivers/i2c/fsl_i2c.c
+++ b/drivers/i2c/fsl_i2c.c
@@ -214,12 +214,12 @@ static unsigned int set_i2c_bus_speed(const struct fsl_i2c *dev,
        return speed;
 }
 
-unsigned int get_i2c_clock(int bus)
+static unsigned int get_i2c_clock(int bus)
 {
        if (bus)
-               return gd->i2c2_clk;    /* I2C2 clock */
+               return gd->arch.i2c2_clk;       /* I2C2 clock */
        else
-               return gd->i2c1_clk;    /* I2C1 clock */
+               return gd->arch.i2c1_clk;       /* I2C1 clock */
 }
 
 void
@@ -383,13 +383,16 @@ i2c_read(u8 dev, uint addr, int alen, u8 *data, int length)
        int i = -1; /* signal error */
        u8 *a = (u8*)&addr;
 
-       if (i2c_wait4bus() >= 0
+       if (i2c_wait4bus() < 0)
+               return -1;
+
+       if ((!length || alen > 0)
            && i2c_write_addr(dev, I2C_WRITE_BIT, 0) != 0
            && __i2c_write(&a[4 - alen], alen) == alen)
                i = 0; /* No error so far */
 
-       if (length
-           && i2c_write_addr(dev, I2C_READ_BIT, 1) != 0)
+       if (length &&
+           i2c_write_addr(dev, I2C_READ_BIT, alen ? 1 : 0) != 0)
                i = __i2c_read(data, length);
 
        writeb(I2C_CR_MEN, &i2c_dev[i2c_bus_num]->cr);
@@ -468,7 +471,8 @@ int i2c_set_bus_num(unsigned int bus)
 
 int i2c_set_bus_speed(unsigned int speed)
 {
-       unsigned int i2c_clk = (i2c_bus_num == 1) ? gd->i2c2_clk : gd->i2c1_clk;
+       unsigned int i2c_clk = (i2c_bus_num == 1)
+                       ? gd->arch.i2c2_clk : gd->arch.i2c1_clk;
 
        writeb(0, &i2c_dev[i2c_bus_num]->cr);           /* stop controller */
        i2c_bus_speed[i2c_bus_num] =