[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>

diff --git a/drivers/i2c/chips/ds1337.c b/drivers/i2c/chips/ds1337.c
index 07f16c3fb084df6aba16f225a7a86f1f6e21be36..e2a6aabdc780f70e8033aa87444f33dbd670c538 100644 (file)
--- 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);