* [PATCH v2 3/6] iio: dac: ad5504: Don't set error code to voltage_uv
@ 2012-12-14 12:06 Axel Lin
2012-12-14 12:07 ` [PATCH v2 4/6] iio: dac: ad5624r_spi: " Axel Lin
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Axel Lin @ 2012-12-14 12:06 UTC (permalink / raw)
To: Jonathan Cameron; +Cc: Michael Hennerich, linux-iio, linux-kernel
regulator_get_voltage() may return negative error code.
Add error checking to avoid setting error code to voltage_uv.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
v2: check if ret is negative value
drivers/iio/dac/ad5504.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/dac/ad5504.c b/drivers/iio/dac/ad5504.c
index 242bdc7..1e9a1f4 100644
--- a/drivers/iio/dac/ad5504.c
+++ b/drivers/iio/dac/ad5504.c
@@ -296,7 +296,11 @@ static int __devinit ad5504_probe(struct spi_device *spi)
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;
}
spi_set_drvdata(spi, indio_dev);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH v2 4/6] iio: dac: ad5624r_spi: Don't set error code to voltage_uv
2012-12-14 12:06 [PATCH v2 3/6] iio: dac: ad5504: Don't set error code to voltage_uv Axel Lin
@ 2012-12-14 12:07 ` Axel Lin
2012-12-14 12:08 ` [PATCH v2 5/6] iio: dac: ad5686: " Axel Lin
2012-12-16 11:09 ` [PATCH v2 3/6] iio: dac: ad5504: " Jonathan Cameron
2 siblings, 0 replies; 4+ messages in thread
From: Axel Lin @ 2012-12-14 12:07 UTC (permalink / raw)
To: Jonathan Cameron; +Cc: Barry Song, linux-iio, linux-kernel
regulator_get_voltage() may return negative error code.
Add error checking to avoid setting error code to voltage_uv.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
v2: check if ret is negative value
drivers/iio/dac/ad5624r_spi.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/dac/ad5624r_spi.c b/drivers/iio/dac/ad5624r_spi.c
index 6a7d6a4..ae7fb64 100644
--- a/drivers/iio/dac/ad5624r_spi.c
+++ b/drivers/iio/dac/ad5624r_spi.c
@@ -238,7 +238,11 @@ static int __devinit ad5624r_probe(struct spi_device *spi)
if (ret)
goto error_put_reg;
- voltage_uv = regulator_get_voltage(st->reg);
+ ret = regulator_get_voltage(st->reg);
+ if (ret < 0)
+ goto error_disable_reg;
+
+ voltage_uv = ret;
}
spi_set_drvdata(spi, indio_dev);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 5/6] iio: dac: ad5686: Don't set error code to voltage_uv
2012-12-14 12:06 [PATCH v2 3/6] iio: dac: ad5504: Don't set error code to voltage_uv Axel Lin
2012-12-14 12:07 ` [PATCH v2 4/6] iio: dac: ad5624r_spi: " Axel Lin
@ 2012-12-14 12:08 ` Axel Lin
2012-12-16 11:09 ` [PATCH v2 3/6] iio: dac: ad5504: " Jonathan Cameron
2 siblings, 0 replies; 4+ messages in thread
From: Axel Lin @ 2012-12-14 12:08 UTC (permalink / raw)
To: Jonathan Cameron; +Cc: Michael Hennerich, linux-iio, linux-kernel
regulator_get_voltage() may return negative error code.
Add error checking to avoid setting error code to voltage_uv.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
v2: check if ret is negative value
drivers/iio/dac/ad5686.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/dac/ad5686.c b/drivers/iio/dac/ad5686.c
index bc92ff9..28f2e59 100644
--- a/drivers/iio/dac/ad5686.c
+++ b/drivers/iio/dac/ad5686.c
@@ -332,7 +332,11 @@ static int __devinit ad5686_probe(struct spi_device *spi)
if (ret)
goto error_put_reg;
- voltage_uv = regulator_get_voltage(st->reg);
+ ret = regulator_get_voltage(st->reg);
+ if (ret < 0)
+ goto error_disable_reg;
+
+ voltage_uv = ret;
}
st->chip_info =
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 3/6] iio: dac: ad5504: Don't set error code to voltage_uv
2012-12-14 12:06 [PATCH v2 3/6] iio: dac: ad5504: Don't set error code to voltage_uv Axel Lin
2012-12-14 12:07 ` [PATCH v2 4/6] iio: dac: ad5624r_spi: " Axel Lin
2012-12-14 12:08 ` [PATCH v2 5/6] iio: dac: ad5686: " Axel Lin
@ 2012-12-16 11:09 ` Jonathan Cameron
2 siblings, 0 replies; 4+ messages in thread
From: Jonathan Cameron @ 2012-12-16 11:09 UTC (permalink / raw)
To: Axel Lin; +Cc: Jonathan Cameron, Michael Hennerich, linux-iio, linux-kernel
On 12/14/2012 12:06 PM, Axel Lin wrote:
> regulator_get_voltage() may return negative error code.
> Add error checking to avoid setting error code to voltage_uv.
>
> Signed-off-by: Axel Lin <axel.lin@ingics.com>
Axel,
I would definitely have prefered a resend of the whole series rather than
just the ones you have fixed up.
I assumed Lars would have no objection to Acking these as well!
Anyhow 1,2,6 from v1 and 3,4,5 from v2 added to fixes-togreg branch of
iio.git.
Thanks for all these!
Jonathan
> ---
> v2: check if ret is negative value
> drivers/iio/dac/ad5504.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/iio/dac/ad5504.c b/drivers/iio/dac/ad5504.c
> index 242bdc7..1e9a1f4 100644
> --- a/drivers/iio/dac/ad5504.c
> +++ b/drivers/iio/dac/ad5504.c
> @@ -296,7 +296,11 @@ static int __devinit ad5504_probe(struct spi_device *spi)
> 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;
> }
>
> spi_set_drvdata(spi, indio_dev);
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-12-16 11:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-14 12:06 [PATCH v2 3/6] iio: dac: ad5504: Don't set error code to voltage_uv Axel Lin
2012-12-14 12:07 ` [PATCH v2 4/6] iio: dac: ad5624r_spi: " Axel Lin
2012-12-14 12:08 ` [PATCH v2 5/6] iio: dac: ad5686: " Axel Lin
2012-12-16 11:09 ` [PATCH v2 3/6] iio: dac: ad5504: " Jonathan Cameron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).