Merge tag 'mfd_3.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / mfd / wm831x-spi.c

diff --git a/drivers/mfd/wm831x-spi.c b/drivers/mfd/wm831x-spi.c
index 8ef7d4f5eeb56c6742f8e72f255a15ce03c55f8b..4bceee98f0a4f848a417217f87dbb31bc8d7594f 100644 (file)
--- a/drivers/mfd/wm831x-spi.c
+++ b/drivers/mfd/wm831x-spi.c
@@ -40,7 +40,7 @@ static int __devinit wm831x_spi_probe(struct spi_device *spi)
        dev_set_drvdata(&spi->dev, wm831x);
        wm831x->dev = &spi->dev;
 
-       wm831x->regmap = regmap_init_spi(spi, &wm831x_regmap_config);
+       wm831x->regmap = devm_regmap_init_spi(spi, &wm831x_regmap_config);
        if (IS_ERR(wm831x->regmap)) {
                ret = PTR_ERR(wm831x->regmap);
                dev_err(wm831x->dev, "Failed to allocate register map: %d\n",