leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

regulator: wm831x-dcdc: Add missing checks for pdata before use

Browse Source 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown 2012-05-14 11:37:09 +01:00
parent cd8318cb9e
commit f0b067d9b6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/regulator/wm831x-dcdc.c
View File

@ -518,7 +518,7 @@ static __devinit int wm831x_buckv_probe(struct platform_device *pdev)
} }
dcdc->dvs_vsel = ret & WM831X_DC1_DVS_VSEL_MASK; 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); wm831x_buckv_dvs_init(dcdc, pdata->dcdc[id]->driver_data);
config.dev = pdev->dev.parent; config.dev = pdev->dev.parent;
@ -846,7 +846,8 @@ static __devinit int wm831x_boostp_probe(struct platform_device *pdev)
dcdc->desc.enable_mask = 1 << id; dcdc->desc.enable_mask = 1 << id;
config.dev = pdev->dev.parent; config.dev = pdev->dev.parent;
config.init_data = pdata->dcdc[id]; if (pdata)
config.init_data = pdata->dcdc[id];
config.driver_data = dcdc; config.driver_data = dcdc;
config.regmap = wm831x->regmap; config.regmap = wm831x->regmap;