Merge branch 'pm-qos'

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / tps65090.c

diff --git a/drivers/mfd/tps65090.c b/drivers/mfd/tps65090.c
index 396b9d1b6bd68bc80ee0120693949461688b8b9f..50fd87c87a1cca64e21104401c1adbff1b4cf45c 100644 (file)
--- a/drivers/mfd/tps65090.c
+++ b/drivers/mfd/tps65090.c
@@ -71,10 +71,10 @@ static const struct tps65090_irq_data tps65090_irqs[] = {
 
 static struct mfd_cell tps65090s[] = {
        {
-               .name = "tps65910-pmic",
+               .name = "tps65090-pmic",
        },
        {
-               .name = "tps65910-regulator",
+               .name = "tps65090-regulator",
        },
 };
 
@@ -292,7 +292,7 @@ static int __devinit tps65090_i2c_probe(struct i2c_client *client,
        }
 
        ret = mfd_add_devices(tps65090->dev, -1, tps65090s,
-               ARRAY_SIZE(tps65090s), NULL, 0);
+                             ARRAY_SIZE(tps65090s), NULL, 0, NULL);
        if (ret) {
                dev_err(&client->dev, "add mfd devices failed with err: %d\n",
                        ret);