lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] I2C: ds1337: i2c_transfer() checking

Browse Source 
i2c_transfer returns number of sucessfully transfered messages. Change
error checking to accordingly. (ds1337_set_datetime never returned
sucess)

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: James Chapman <jchapman@katalix.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Ladislav Michl
2005-05-04 08:13:54 +02:00
committed by Greg Kroah-Hartman
parent 0b46e334d7
commit 0058824305
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/i2c/chips/ds1337.c
View File

@@ -122,7 +122,7 @@ static int ds1337_get_datetime(struct i2c_client *client, struct rtc_time *dt)
__FUNCTION__, result, buf[0], buf[1], buf[2], buf[3], __FUNCTION__, result, buf[0], buf[1], buf[2], buf[3],
buf[4], buf[5], buf[6]); buf[4], buf[5], buf[6]);
if (result >= 0) { if (result == 2) {
dt->tm_sec = BCD2BIN(buf[0]); dt->tm_sec = BCD2BIN(buf[0]);
dt->tm_min = BCD2BIN(buf[1]); dt->tm_min = BCD2BIN(buf[1]);
val = buf[2] & 0x3f; val = buf[2] & 0x3f;
@@ -140,12 +140,12 @@ static int ds1337_get_datetime(struct i2c_client *client, struct rtc_time *dt)
__FUNCTION__, dt->tm_sec, dt->tm_min, __FUNCTION__, dt->tm_sec, dt->tm_min,
dt->tm_hour, dt->tm_mday, dt->tm_hour, dt->tm_mday,
dt->tm_mon, dt->tm_year, dt->tm_wday); dt->tm_mon, dt->tm_year, dt->tm_wday);
} else {
dev_err(&client->dev, "error reading data! %d\n", result); return 0;
result = -EIO;
} }
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) static int ds1337_set_datetime(struct i2c_client *client, struct rtc_time *dt)
@@ -185,14 +185,11 @@ static int ds1337_set_datetime(struct i2c_client *client, struct rtc_time *dt)
msg[0].buf = &buf[0]; msg[0].buf = &buf[0];
result = i2c_transfer(client->adapter, msg, 1); result = i2c_transfer(client->adapter, msg, 1);
if (result < 0) { if (result == 1)
dev_err(&client->dev, "error writing data! %d\n", result); return 0;
result = -EIO;
} else {
result = 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, static int ds1337_command(struct i2c_client *client, unsigned int cmd,