diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-14 11:37:09 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-14 11:41:36 +0100 |
| commit | f0b067d9b6474e5309dd47ab30264cd0a48d4963 (patch) | |
| tree | 96c4f849fedcaf2763a38379850edd2239829738 /drivers/regulator | |
| parent | cd8318cb9e8dea0dcf8ccb15955b48d14ba51e52 (diff) | |
| download | linux-f0b067d9b6474e5309dd47ab30264cd0a48d4963.tar.gz linux-f0b067d9b6474e5309dd47ab30264cd0a48d4963.tar.xz linux-f0b067d9b6474e5309dd47ab30264cd0a48d4963.zip | |
regulator: wm831x-dcdc: Add missing checks for pdata before use
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/wm831x-dcdc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c index 8710cfb0c19b..a885911bb5fc 100644 --- a/drivers/regulator/wm831x-dcdc.c +++ b/drivers/regulator/wm831x-dcdc.c @@ -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; @@ -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; |