From 7f2b205054fb2e34bfb4ee65ade5a5221af2ea4b Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Wed, 6 Apr 2011 00:20:24 +0200
Subject: [PATCH] --- yaml --- r: 251902 b: refs/heads/master c:
 1f235a3785dbcfb324ff228048b859a3bd1e1a59 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/mfd/ab3550-core.c  | 6 ++++--
 trunk/include/linux/mfd/abx500.h | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1b98b6f960a4..8915c0ccb3f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb8956074e7652e802be5f078080c704c2c87104
+refs/heads/master: 1f235a3785dbcfb324ff228048b859a3bd1e1a59
diff --git a/trunk/drivers/mfd/ab3550-core.c b/trunk/drivers/mfd/ab3550-core.c
index ff86acf3e6bd..3d7dce671b93 100644
--- a/trunk/drivers/mfd/ab3550-core.c
+++ b/trunk/drivers/mfd/ab3550-core.c
@@ -1320,8 +1320,10 @@ static int __init ab3550_probe(struct i2c_client *client,
 		goto exit_no_ops;
 
 	/* Set up and register the platform devices. */
-	for (i = 0; i < AB3550_NUM_DEVICES; i++)
-		ab3550_devs[i].mfd_data = ab3550_plf_data->dev_data[i];
+	for (i = 0; i < AB3550_NUM_DEVICES; i++) {
+		ab3550_devs[i].platform_data = ab3550_plf_data->dev_data[i];
+		ab3550_devs[i].pdata_size = ab3550_plf_data->dev_data_sz[i];
+	}
 
 	err = mfd_add_devices(&client->dev, 0, ab3550_devs,
 		ARRAY_SIZE(ab3550_devs), NULL,
diff --git a/trunk/include/linux/mfd/abx500.h b/trunk/include/linux/mfd/abx500.h
index 7d9b6ae1c203..67bd6f7ecf32 100644
--- a/trunk/include/linux/mfd/abx500.h
+++ b/trunk/include/linux/mfd/abx500.h
@@ -186,6 +186,7 @@ struct abx500_init_settings {
 struct ab3550_platform_data {
 	struct {unsigned int base; unsigned int count; } irq;
 	void *dev_data[AB3550_NUM_DEVICES];
+	size_t dev_data_sz[AB3550_NUM_DEVICES];
 	struct abx500_init_settings *init_settings;
 	unsigned int init_settings_sz;
 };