From 238ac0916d60325f04b1760b928e09effdc5bd41 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Wed, 14 Apr 2010 16:14:08 +0200 Subject: [PATCH] --- yaml --- r: 189900 b: refs/heads/master c: c7a78d2c2e2537fd24903e966f34aae50319d587 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/sht15.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d01e8c2a9140..89cfd1c90975 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 328a2c22abd08911e37fa66f1358f829cecd72e9 +refs/heads/master: c7a78d2c2e2537fd24903e966f34aae50319d587 diff --git a/trunk/drivers/hwmon/sht15.c b/trunk/drivers/hwmon/sht15.c index 9a15b1af1f11..a610e7880fb3 100644 --- a/trunk/drivers/hwmon/sht15.c +++ b/trunk/drivers/hwmon/sht15.c @@ -542,7 +542,12 @@ static int __devinit sht15_probe(struct platform_device *pdev) /* If a regulator is available, query what the supply voltage actually is!*/ data->reg = regulator_get(data->dev, "vcc"); if (!IS_ERR(data->reg)) { - data->supply_uV = regulator_get_voltage(data->reg); + int voltage; + + voltage = regulator_get_voltage(data->reg); + if (voltage) + data->supply_uV = voltage; + regulator_enable(data->reg); /* setup a notifier block to update this if another device * causes the voltage to change */