From 6a0a69d3ae2f28bc67c3f1d744d4ffc0948da45d Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Fri, 14 Dec 2012 07:48:00 +0000 Subject: [PATCH] --- yaml --- r: 348713 b: refs/heads/master c: 272cc9c8b5d0dffe9fb03e6c0ab3da2fde9c20e9 h: refs/heads/master i: 348711: c202c15b95bb063fedf836ae5d55811142849dfc v: v3 --- [refs] | 2 +- trunk/drivers/iio/dac/ad5380.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dc1d8ebca276..811067c746f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36ce0c1c3ab7ea54fa6c2b3a0803c7ab0adcefbf +refs/heads/master: 272cc9c8b5d0dffe9fb03e6c0ab3da2fde9c20e9 diff --git a/trunk/drivers/iio/dac/ad5380.c b/trunk/drivers/iio/dac/ad5380.c index 14991ac55f26..4aca1895ce52 100644 --- a/trunk/drivers/iio/dac/ad5380.c +++ b/trunk/drivers/iio/dac/ad5380.c @@ -406,7 +406,11 @@ static int __devinit ad5380_probe(struct device *dev, struct regmap *regmap, goto error_free_reg; } - st->vref = regulator_get_voltage(st->vref_reg); + ret = regulator_get_voltage(st->vref_reg); + if (ret < 0) + goto error_disable_reg; + + st->vref = ret; } else { st->vref = st->chip_info->int_vref; ctrl |= AD5380_CTRL_INT_VREF_EN;