From: Mark Brown broonie@linaro.org
The per-regulator pdata is optional so we need to check that it's there before dereferencing it. This wasn't done in "regulator: tps65090: Allow setting the overcurrent wait time", fix that.
Reported-by: Olof Johansson olof@lixom.net Signed-off-by: Mark Brown broonie@linaro.org --- drivers/regulator/tps65090-regulator.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/regulator/tps65090-regulator.c b/drivers/regulator/tps65090-regulator.c index ca04e9f..fbe0bf5 100644 --- a/drivers/regulator/tps65090-regulator.c +++ b/drivers/regulator/tps65090-regulator.c @@ -306,8 +306,11 @@ static int tps65090_regulator_probe(struct platform_device *pdev) ri = &pmic[num]; ri->dev = &pdev->dev; ri->desc = &tps65090_regulator_desc[num]; - ri->overcurrent_wait_valid = tps_pdata->overcurrent_wait_valid; - ri->overcurrent_wait = tps_pdata->overcurrent_wait; + if (tps_pdata) { + ri->overcurrent_wait_valid = + tps_pdata->overcurrent_wait_valid; + ri->overcurrent_wait = tps_pdata->overcurrent_wait; + }
/* * TPS5090 DCDC support the control from external digital input.