diff options
| author | Mark Brown <broonie@linaro.org> | 2014-02-10 17:37:55 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-10 17:37:55 +0000 |
| commit | 4ed15484d2b90c28ecb0eb4ed0330049343c60ad (patch) | |
| tree | a95b5adbc989002647a42b0f392f311015a0fa02 /drivers/mfd/max77686.c | |
| parent | 0f3550b731084e2790caf1d73bfe0e3a454aafae (diff) | |
| parent | 4b9c8ddadce3ec70fa5d93875adeda861b21c84e (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'drivers/mfd/max77686.c')
| -rw-r--r-- | drivers/mfd/max77686.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c index 1cbb17609c8..8290c238239 100644 --- a/drivers/mfd/max77686.c +++ b/drivers/mfd/max77686.c @@ -102,7 +102,7 @@ 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); + max77686->regmap = devm_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", |