From b03585217c84b7c575aa6f9a73e3455a12379530 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Tue, 18 Dec 2012 03:33:00 +0000 Subject: [PATCH] --- yaml --- r: 348718 b: refs/heads/master c: 13e57ee2056221296f1926d49d00edd224058bea h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/iio/dac/ad5446.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bf72c7dddfb6..f9b971c118e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 359570ad3fcfcc3a3031b3a5e01bfb616233eca0 +refs/heads/master: 13e57ee2056221296f1926d49d00edd224058bea diff --git a/trunk/drivers/iio/dac/ad5446.c b/trunk/drivers/iio/dac/ad5446.c index 3310cbbd41e7..ecb639540dff 100644 --- a/trunk/drivers/iio/dac/ad5446.c +++ b/trunk/drivers/iio/dac/ad5446.c @@ -226,7 +226,11 @@ static int __devinit ad5446_probe(struct device *dev, const char *name, if (ret) goto error_put_reg; - voltage_uv = regulator_get_voltage(reg); + ret = regulator_get_voltage(reg); + if (ret < 0) + goto error_disable_reg; + + voltage_uv = ret; } indio_dev = iio_device_alloc(sizeof(*st));