From bda2d0efc2088849af9243d5ab8a883f6a3a1c2b Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Tue, 25 Dec 2012 00:16:43 +0800 Subject: [PATCH] --- yaml --- r: 349301 b: refs/heads/master c: 136d982ecae912c815587a1653f235f0ef570da8 h: refs/heads/master i: 349299: 3b89e6e0f55328f9c72f3b8bd1f79f369e4643b8 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/max77686.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index da03b81b16d7..c8b9d38674e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 89d9b1c99374997d68910ba49d5b7df80e7f2061 +refs/heads/master: 136d982ecae912c815587a1653f235f0ef570da8 diff --git a/trunk/drivers/mfd/max77686.c b/trunk/drivers/mfd/max77686.c index f6878f8db57d..4d73963cd8f0 100644 --- a/trunk/drivers/mfd/max77686.c +++ b/trunk/drivers/mfd/max77686.c @@ -93,15 +93,6 @@ static int max77686_i2c_probe(struct i2c_client *i2c, if (max77686 == NULL) return -ENOMEM; - max77686->regmap = regmap_init_i2c(i2c, &max77686_regmap_config); - if (IS_ERR(max77686->regmap)) { - ret = PTR_ERR(max77686->regmap); - dev_err(max77686->dev, "Failed to allocate register map: %d\n", - ret); - kfree(max77686); - return ret; - } - i2c_set_clientdata(i2c, max77686); max77686->dev = &i2c->dev; max77686->i2c = i2c; @@ -111,6 +102,15 @@ static int max77686_i2c_probe(struct i2c_client *i2c, max77686->irq_gpio = pdata->irq_gpio; max77686->irq = i2c->irq; + max77686->regmap = regmap_init_i2c(i2c, &max77686_regmap_config); + if (IS_ERR(max77686->regmap)) { + ret = PTR_ERR(max77686->regmap); + dev_err(max77686->dev, "Failed to allocate register map: %d\n", + ret); + kfree(max77686); + return ret; + } + if (regmap_read(max77686->regmap, MAX77686_REG_DEVICE_ID, &data) < 0) { dev_err(max77686->dev,