Skip to content

Commit

Permalink
regulator: wm831x-dcdc: Add missing checks for pdata before use
Browse files Browse the repository at this point in the history
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Mark Brown committed May 14, 2012
1 parent cd8318c commit f0b067d
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/regulator/wm831x-dcdc.c
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ static __devinit int wm831x_buckv_probe(struct platform_device *pdev)
}
dcdc->dvs_vsel = ret & WM831X_DC1_DVS_VSEL_MASK;

if (pdata->dcdc[id])
if (pdata && pdata->dcdc[id])
wm831x_buckv_dvs_init(dcdc, pdata->dcdc[id]->driver_data);

config.dev = pdev->dev.parent;
Expand Down Expand Up @@ -846,7 +846,8 @@ static __devinit int wm831x_boostp_probe(struct platform_device *pdev)
dcdc->desc.enable_mask = 1 << id;

config.dev = pdev->dev.parent;
config.init_data = pdata->dcdc[id];
if (pdata)
config.init_data = pdata->dcdc[id];
config.driver_data = dcdc;
config.regmap = wm831x->regmap;

Expand Down

0 comments on commit f0b067d

Please sign in to comment.