From abc2bb58024814d485898e01572cb5eabd84af67 Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Tue, 13 Nov 2012 19:33:56 +0530 Subject: [PATCH] --- yaml --- r: 344971 b: refs/heads/master c: 10ecb80e8cb450f5b10c9aff168842c9a3c949ef h: refs/heads/master i: 344969: 9b0a63db137e8d7124139f237b02255f436b46ef 344967: 42396c243d1dec6422f44785a80ca20b221bd7ad v: v3 --- [refs] | 2 +- trunk/drivers/mfd/tps65910.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 0a8e82bb3c8e..873e286a4571 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7aae79fd8857794406841ededbdef493fac3d889 +refs/heads/master: 10ecb80e8cb450f5b10c9aff168842c9a3c949ef diff --git a/trunk/drivers/mfd/tps65910.c b/trunk/drivers/mfd/tps65910.c index 0d79ce2b5014..27fbbe510101 100644 --- a/trunk/drivers/mfd/tps65910.c +++ b/trunk/drivers/mfd/tps65910.c @@ -279,14 +279,6 @@ static __devinit int tps65910_i2c_probe(struct i2c_client *i2c, return ret; } - ret = mfd_add_devices(tps65910->dev, -1, - tps65910s, ARRAY_SIZE(tps65910s), - NULL, 0, NULL); - if (ret < 0) { - dev_err(&i2c->dev, "mfd_add_devices failed: %d\n", ret); - return ret; - } - init_data->irq = pmic_plat_data->irq; init_data->irq_base = pmic_plat_data->irq_base; @@ -299,6 +291,14 @@ static __devinit int tps65910_i2c_probe(struct i2c_client *i2c, pm_power_off = tps65910_power_off; } + ret = mfd_add_devices(tps65910->dev, -1, + tps65910s, ARRAY_SIZE(tps65910s), + NULL, 0, NULL); + if (ret < 0) { + dev_err(&i2c->dev, "mfd_add_devices failed: %d\n", ret); + return ret; + } + return ret; }