xen/acpi: Fix Kconfig dependency on CPU_FREQ

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / regulator / aat2870-regulator.c

diff --git a/drivers/regulator/aat2870-regulator.c b/drivers/regulator/aat2870-regulator.c
index 298c6c6..685ad43 100644 (file)
--- a/drivers/regulator/aat2870-regulator.c
+++ b/drivers/regulator/aat2870-regulator.c
@@ -63,7 +63,7 @@ static int aat2870_ldo_set_voltage_sel(struct regulator_dev *rdev,
        struct aat2870_data *aat2870 = dev_get_drvdata(ri->pdev->dev.parent);
 
        return aat2870->update(aat2870, ri->voltage_addr, ri->voltage_mask,
-                       (selector << ri->voltage_shift) & ri->voltage_mask);
+                              selector << ri->voltage_shift);
 }
 
 static int aat2870_ldo_get_voltage_sel(struct regulator_dev *rdev)
@@ -188,7 +188,7 @@ static int aat2870_regulator_probe(struct platform_device *pdev)
        ri->pdev = pdev;
 
        rdev = regulator_register(&ri->desc, &pdev->dev,
-                                 pdev->dev.platform_data, ri);
+                                 pdev->dev.platform_data, ri, NULL);
        if (IS_ERR(rdev)) {
                dev_err(&pdev->dev, "Failed to register regulator %s\n",
                        ri->desc.name);