Message ID | 1366963900-2784-5-git-send-email-dirk.eibach@gdsys.cc |
---|---|
State | Superseded |
Headers | show |
Dirk Eibach <dirk.eibach <at> gdsys.cc> writes: > > From: Reinhard Pfau <pfau <at> gdsys.de> > > if alen is 0: no longer start a write cycle before reading data. > > Signed-off-by: Dirk Eibach <dirk.eibach <at> gdsys.cc> > Signed-off-by: Reinhard Pfau <reinhard.pfau <at> gdsys.cc> > Since I saw no response to my previous email, http://article.gmane.org/gmane.comp.boot-loaders.u-boot/159456, I looked a little more closely. > --- > Changes in v4: None > Changes in v3: None > Changes in v2: > - whitespace fixes > > drivers/i2c/fsl_i2c.c | 9 ++++++--- > 1 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c > index 1c7265d..ab86bef 100644 > --- a/drivers/i2c/fsl_i2c.c > +++ b/drivers/i2c/fsl_i2c.c > <at> <at> -383,13 +383,16 <at> <at> 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 (alen > 0 > <snip> On visual inspection of $(UBOOT)/drivers/i2c/fsl_i2c.c, these proposed changes will cause i2c_probe(), in the same source file, to fail. i2c_probe() calls i2c_read() with alen=0. Unless I'm missing something. Jim
diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c index 1c7265d..ab86bef 100644 --- a/drivers/i2c/fsl_i2c.c +++ b/drivers/i2c/fsl_i2c.c @@ -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 (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);