diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-01 08:50:17 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-01 08:50:17 -0400 |
| commit | f27a5fb424d4897edd3c7735ecf054ee57a5dbd0 (patch) | |
| tree | a6bc4d322341ee1211657302f41614b52572b207 /drivers/hwmon | |
| parent | 6979380d85fd9e1ff701021206b315fcd66b510e (diff) | |
| parent | 9efdd27678ef5e22c27c230a08a211b702768f3a (diff) | |
Merge remote-tracking branch 'regulator/topic/optional' into regulator-next
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/sht15.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c index 2507f902fb7a..ab5dc3af4cfb 100644 --- a/drivers/hwmon/sht15.c +++ b/drivers/hwmon/sht15.c | |||
| @@ -957,7 +957,7 @@ static int sht15_probe(struct platform_device *pdev) | |||
| 957 | * If a regulator is available, | 957 | * If a regulator is available, |
| 958 | * query what the supply voltage actually is! | 958 | * query what the supply voltage actually is! |
| 959 | */ | 959 | */ |
| 960 | data->reg = devm_regulator_get(data->dev, "vcc"); | 960 | data->reg = devm_regulator_get_optional(data->dev, "vcc"); |
| 961 | if (!IS_ERR(data->reg)) { | 961 | if (!IS_ERR(data->reg)) { |
| 962 | int voltage; | 962 | int voltage; |
| 963 | 963 | ||