Merge branch 'akpm' (Andrew's patch-bomb)

[cascardo/linux.git] / drivers / mfd / wm831x-i2c.c

diff --git a/drivers/mfd/wm831x-i2c.c b/drivers/mfd/wm831x-i2c.c
index cb15609..2b29cae 100644 (file)
--- a/drivers/mfd/wm831x-i2c.c
+++ b/drivers/mfd/wm831x-i2c.c
@@ -37,7 +37,7 @@ static int wm831x_i2c_probe(struct i2c_client *i2c,
        i2c_set_clientdata(i2c, wm831x);
        wm831x->dev = &i2c->dev;
 
-       wm831x->regmap = regmap_init_i2c(i2c, &wm831x_regmap_config);
+       wm831x->regmap = devm_regmap_init_i2c(i2c, &wm831x_regmap_config);
        if (IS_ERR(wm831x->regmap)) {
                ret = PTR_ERR(wm831x->regmap);
                dev_err(wm831x->dev, "Failed to allocate register map: %d\n",