summaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-01 13:50:17 +0100
committerMark Brown <broonie@linaro.org>2013-09-01 13:50:17 +0100
commitf27a5fb424d4897edd3c7735ecf054ee57a5dbd0 (patch)
treea6bc4d322341ee1211657302f41614b52572b207 /drivers/hwmon
parent6979380d85fd9e1ff701021206b315fcd66b510e (diff)
parent9efdd27678ef5e22c27c230a08a211b702768f3a (diff)
downloadop-kernel-dev-f27a5fb424d4897edd3c7735ecf054ee57a5dbd0.zip
op-kernel-dev-f27a5fb424d4897edd3c7735ecf054ee57a5dbd0.tar.gz
Merge remote-tracking branch 'regulator/topic/optional' into regulator-next
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/sht15.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
index 2507f90..ab5dc3a 100644
--- a/drivers/hwmon/sht15.c
+++ b/drivers/hwmon/sht15.c
@@ -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;
OpenPOWER on IntegriCloud