From 3261c12ec638aaf88220194cf287a1a7b5b59ef4 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Wed, 13 Jul 2011 23:22:26 +0200
Subject: [PATCH] --- yaml --- r: 261895 b: refs/heads/master c:
 b1224cd113d4441edee4a58a1e2e428141247c0d h: refs/heads/master i:   261893:
 bdb1ad277384a0fb7c1a63c249d251fa252157fc   261891:
 5bd9f265e9d260fb2479f51e23fa05c766e43c4e   261887:
 96e7d189f65df991a4b4804f7ad8c8c09dc480a4 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/mfd/tps65910.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a3181b1734d7..2b11502c832a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6daa663dc42957ca6c794a84fe07fa09f0273ff9
+refs/heads/master: b1224cd113d4441edee4a58a1e2e428141247c0d
diff --git a/trunk/drivers/mfd/tps65910.c b/trunk/drivers/mfd/tps65910.c
index 0226cdea2b47..6f5b8cf2f652 100644
--- a/trunk/drivers/mfd/tps65910.c
+++ b/trunk/drivers/mfd/tps65910.c
@@ -147,9 +147,6 @@ static int tps65910_i2c_probe(struct i2c_client *i2c,
 	if (init_data == NULL)
 		return -ENOMEM;
 
-	init_data->irq = pmic_plat_data->irq;
-	init_data->irq_base = pmic_plat_data->irq;
-
 	tps65910 = kzalloc(sizeof(struct tps65910), GFP_KERNEL);
 	if (tps65910 == NULL) {
 		kfree(init_data);
@@ -170,6 +167,9 @@ static int tps65910_i2c_probe(struct i2c_client *i2c,
 	if (ret < 0)
 		goto err;
 
+	init_data->irq = pmic_plat_data->irq;
+	init_data->irq_base = pmic_plat_data->irq;
+
 	tps65910_gpio_init(tps65910, pmic_plat_data->gpio_base);
 
 	ret = tps65910_irq_init(tps65910, init_data->irq, init_data);