From ladis@linux-mips.org Wed May 4 00:32:52 2005 From: Ladislav Michl Date: Wed, 4 May 2005 08:13:54 +0200 To: Greg KH Cc: Jean Delvare , James Chapman Subject: I2C: ds1337: i2c_transfer() checking Message-ID: <20050504061354.GC1439@orphique> i2c_transfer returns number of sucessfully transfered messages. Change error checking to accordingly. (ds1337_set_datetime never returned sucess) Signed-off-by: Ladislav Michl Signed-off-by: James Chapman Signed-off-by: Greg Kroah-Hartman --- drivers/i2c/chips/ds1337.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) --- gregkh-2.6.orig/drivers/i2c/chips/ds1337.c 2005-05-06 09:23:48.000000000 -0700 +++ gregkh-2.6/drivers/i2c/chips/ds1337.c 2005-05-06 09:23:56.000000000 -0700 @@ -122,7 +122,7 @@ __FUNCTION__, result, buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6]); - if (result >= 0) { + if (result == 2) { dt->tm_sec = BCD2BIN(buf[0]); dt->tm_min = BCD2BIN(buf[1]); val = buf[2] & 0x3f; @@ -140,12 +140,12 @@ __FUNCTION__, dt->tm_sec, dt->tm_min, dt->tm_hour, dt->tm_mday, dt->tm_mon, dt->tm_year, dt->tm_wday); - } else { - dev_err(&client->dev, "error reading data! %d\n", result); - result = -EIO; + + return 0; } - return result; + dev_err(&client->dev, "error reading data! %d\n", result); + return -EIO; } static int ds1337_set_datetime(struct i2c_client *client, struct rtc_time *dt) @@ -185,14 +185,11 @@ msg[0].buf = &buf[0]; result = i2c_transfer(client->adapter, msg, 1); - if (result < 0) { - dev_err(&client->dev, "error writing data! %d\n", result); - result = -EIO; - } else { - result = 0; - } + if (result == 1) + return 0; - return result; + dev_err(&client->dev, "error writing data! %d\n", result); + return -EIO; } static int ds1337_command(struct i2c_client *client, unsigned int cmd,