We should always be able to probe a regulator with no platform data. This
will enable readback of current state, though no changes can be made to
the device configuration.

Signed-off-by: Mark Brown <[email protected]>
---
 drivers/regulator/tps65217-regulator.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/regulator/tps65217-regulator.c 
b/drivers/regulator/tps65217-regulator.c
index d58db72a63b0..1cf16aed9735 100644
--- a/drivers/regulator/tps65217-regulator.c
+++ b/drivers/regulator/tps65217-regulator.c
@@ -230,11 +230,6 @@ static int tps65217_regulator_probe(struct platform_device 
*pdev)
        if (tps->dev->of_node)
                pdata = tps65217_parse_dt(pdev);
 
-       if (!pdata) {
-               dev_err(&pdev->dev, "Platform data not found\n");
-               return -EINVAL;
-       }
-
        if (tps65217_chip_id(tps) != TPS65217) {
                dev_err(&pdev->dev, "Invalid tps chip version\n");
                return -ENODEV;
@@ -245,7 +240,8 @@ static int tps65217_regulator_probe(struct platform_device 
*pdev)
        for (i = 0; i < TPS65217_NUM_REGULATOR; i++) {
                /* Register the regulators */
                config.dev = tps->dev;
-               config.init_data = pdata->tps65217_init_data[i];
+               if (pdata)
+                       config.init_data = pdata->tps65217_init_data[i];
                config.driver_data = tps;
                config.regmap = tps->regmap;
                if (tps->dev->of_node)
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to