diff options
| author | Ladislav Michl <ladis@linux-mips.org> | 2005-04-08 15:00:21 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-21 21:51:50 -0700 |
| commit | 3e9d0ba1305cd7c6efd2ab3a003e58a27da1796b (patch) | |
| tree | bdbcf0d4fca8ed72cb59ae89fa9e513bd2c3da3e /drivers/i2c/chips | |
| parent | 69113efac29e5f1b7a03dd4fdca5ede6901f4eb8 (diff) | |
| download | blackbird-op-linux-3e9d0ba1305cd7c6efd2ab3a003e58a27da1796b.tar.gz blackbird-op-linux-3e9d0ba1305cd7c6efd2ab3a003e58a27da1796b.zip | |
[PATCH] I2C: ds1337 1/4
Use i2c_transfer to send message, so we get proper bus locking.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/i2c/chips')
| -rw-r--r-- | drivers/i2c/chips/ds1337.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/i2c/chips/ds1337.c b/drivers/i2c/chips/ds1337.c index 07f16c3fb084..e2a6aabdc780 100644 --- a/drivers/i2c/chips/ds1337.c +++ b/drivers/i2c/chips/ds1337.c @@ -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 @@ -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", @@ -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); |
