From 3d33568b0251233eca2d391dd7d3c47a57a99e6e Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Wed, 6 Feb 2008 01:38:41 -0800
Subject: [PATCH] --- yaml --- r: 83525 b: refs/heads/master c:
 037e291cc77a4beb0379a8c74e3d82e49a476b84 h: refs/heads/master i:   83523:
 5591dfd9c26ecd681a9804dc9ce423db5a43388f v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/rtc/rtc-pcf8583.c | 24 +++++++-----------------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index 5e06f27079ce..129e424a2d0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09b6bdb3b6a95fe270107c2831e033f9cb233d2d
+refs/heads/master: 037e291cc77a4beb0379a8c74e3d82e49a476b84
diff --git a/trunk/drivers/rtc/rtc-pcf8583.c b/trunk/drivers/rtc/rtc-pcf8583.c
index c973ba94c422..8b3997007506 100644
--- a/trunk/drivers/rtc/rtc-pcf8583.c
+++ b/trunk/drivers/rtc/rtc-pcf8583.c
@@ -163,27 +163,17 @@ static int pcf8583_read_mem(struct i2c_client *client, struct rtc_mem *mem)
 
 static int pcf8583_write_mem(struct i2c_client *client, struct rtc_mem *mem)
 {
-	unsigned char addr[1];
-	struct i2c_msg msgs[2] = {
-		{
-			.addr = client->addr,
-			.flags = 0,
-			.len = 1,
-			.buf = addr,
-		}, {
-			.addr = client->addr,
-			.flags = I2C_M_NOSTART,
-			.len = mem->nr,
-			.buf = mem->data,
-		}
-	};
+	unsigned char buf[9];
+	int ret;
 
-	if (mem->loc < 8)
+	if (mem->loc < 8 || mem->nr > 8)
 		return -EINVAL;
 
-	addr[0] = mem->loc;
+	buf[0] = mem->loc;
+	memcpy(buf + 1, mem->data, mem->nr);
 
-	return i2c_transfer(client->adapter, msgs, 2) == 2 ? 0 : -EIO;
+	ret = i2c_master_send(client, buf, mem->nr + 1);
+	return ret == mem->nr + 1 ? 0 : -EIO;
 }
 
 static int pcf8583_rtc_read_time(struct device *dev, struct rtc_time *tm)