Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 2688
b: refs/heads/master
c: 3e9d0ba
h: refs/heads/master
v: v3
  • Loading branch information
Ladislav Michl authored and Greg Kroah-Hartman committed Jun 22, 2005
1 parent fb4d3fd commit e9aeadd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 69113efac29e5f1b7a03dd4fdca5ede6901f4eb8
refs/heads/master: 3e9d0ba1305cd7c6efd2ab3a003e58a27da1796b
8 changes: 3 additions & 5 deletions trunk/drivers/i2c/chips/ds1337.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Copyright (C) 2005 James Chapman <jchapman@katalix.com>
*
* based on linux/drivers/acron/char/pcf8583.c
* based on linux/drivers/acorn/char/pcf8583.c
* Copyright (C) 2000 Russell King
*
* This program is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -119,8 +119,7 @@ static int ds1337_get_datetime(struct i2c_client *client, struct rtc_time *dt)
msg[1].len = sizeof(buf);
msg[1].buf = &buf[0];

result = client->adapter->algo->master_xfer(client->adapter,
&msg[0], 2);
result = i2c_transfer(client->adapter, msg, 2);

dev_dbg(&client->adapter->dev,
"%s: [%d] %02x %02x %02x %02x %02x %02x %02x\n",
Expand Down Expand Up @@ -194,8 +193,7 @@ static int ds1337_set_datetime(struct i2c_client *client, struct rtc_time *dt)
msg[0].len = sizeof(buf);
msg[0].buf = &buf[0];

result = client->adapter->algo->master_xfer(client->adapter,
&msg[0], 1);
result = i2c_transfer(client->adapter, msg, 1);
if (result < 0) {
dev_err(&client->adapter->dev, "ds1337[%d]: error "
"writing data! %d\n", data->id, result);
Expand Down

0 comments on commit e9aeadd

Please sign in to comment.