Merge remote-tracking branch 'regulator/topic/as3711' into regulator-next

This commit is contained in:
Mark Brown 2013-02-19 12:42:31 +00:00
commit 20ab4a7a79

View file

@ -303,7 +303,7 @@ static int as3711_regulator_probe(struct platform_device *pdev)
reg_data = pdata ? pdata->init_data[id] : NULL;
/* No need to register if there is no regulator data */
if (!ri->desc.name)
if (!reg_data)
continue;
reg = &regs[id];