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

This commit is contained in:
Mark Brown 2013-09-01 13:50:17 +01:00
commit f27a5fb424
8 changed files with 121 additions and 7 deletions

View file

@ -957,7 +957,7 @@ static int sht15_probe(struct platform_device *pdev)
* If a regulator is available,
* query what the supply voltage actually is!
*/
data->reg = devm_regulator_get(data->dev, "vcc");
data->reg = devm_regulator_get_optional(data->dev, "vcc");
if (!IS_ERR(data->reg)) {
int voltage;