* [PATCH] iio: mxs-lradc: Check the return value from stmp_reset_block()
@ 2013-07-10 2:36 Fabio Estevam
2013-07-10 11:43 ` Marek Vasut
0 siblings, 1 reply; 3+ messages in thread
From: Fabio Estevam @ 2013-07-10 2:36 UTC (permalink / raw)
To: jic23; +Cc: marex, shawn.guo, linux-iio, Fabio Estevam
From: Fabio Estevam <fabio.estevam@freescale.com>
stmp_reset_block() may fail, so let's check its return value and propagate it in
the case of error.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
drivers/staging/iio/adc/mxs-lradc.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c
index d92c97a..327914e 100644
--- a/drivers/staging/iio/adc/mxs-lradc.c
+++ b/drivers/staging/iio/adc/mxs-lradc.c
@@ -845,14 +845,16 @@ static const struct iio_chan_spec mxs_lradc_chan_spec[] = {
MXS_ADC_CHAN(15, IIO_VOLTAGE), /* VDD5V */
};
-static void mxs_lradc_hw_init(struct mxs_lradc *lradc)
+static int mxs_lradc_hw_init(struct mxs_lradc *lradc)
{
/* The ADC always uses DELAY CHANNEL 0. */
const uint32_t adc_cfg =
(1 << (LRADC_DELAY_TRIGGER_DELAYS_OFFSET + 0)) |
(LRADC_DELAY_TIMER_PER << LRADC_DELAY_DELAY_OFFSET);
- stmp_reset_block(lradc->base);
+ int ret = stmp_reset_block(lradc->base);
+ if (ret)
+ return ret;
/* Configure DELAY CHANNEL 0 for generic ADC sampling. */
writel(adc_cfg, lradc->base + LRADC_DELAY(0));
@@ -873,6 +875,8 @@ static void mxs_lradc_hw_init(struct mxs_lradc *lradc)
/* Start internal temperature sensing. */
writel(0, lradc->base + LRADC_CTRL2);
+
+ return 0;
}
static void mxs_lradc_hw_stop(struct mxs_lradc *lradc)
@@ -980,7 +984,9 @@ static int mxs_lradc_probe(struct platform_device *pdev)
goto err_trig;
/* Configure the hardware. */
- mxs_lradc_hw_init(lradc);
+ ret = mxs_lradc_hw_init(lradc);
+ if (ret)
+ goto err_dev;
/* Register the touchscreen input device. */
ret = mxs_lradc_ts_register(lradc);
--
1.8.1.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] iio: mxs-lradc: Check the return value from stmp_reset_block()
2013-07-10 2:36 [PATCH] iio: mxs-lradc: Check the return value from stmp_reset_block() Fabio Estevam
@ 2013-07-10 11:43 ` Marek Vasut
2013-07-12 19:44 ` Jonathan Cameron
0 siblings, 1 reply; 3+ messages in thread
From: Marek Vasut @ 2013-07-10 11:43 UTC (permalink / raw)
To: Fabio Estevam; +Cc: jic23, shawn.guo, linux-iio, Fabio Estevam
Dear Fabio Estevam,
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> stmp_reset_block() may fail, so let's check its return value and propagate
> it in the case of error.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> drivers/staging/iio/adc/mxs-lradc.c | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
Acked-by: Marek Vasut <marex@denx.de>
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] iio: mxs-lradc: Check the return value from stmp_reset_block()
2013-07-10 11:43 ` Marek Vasut
@ 2013-07-12 19:44 ` Jonathan Cameron
0 siblings, 0 replies; 3+ messages in thread
From: Jonathan Cameron @ 2013-07-12 19:44 UTC (permalink / raw)
To: Marek Vasut; +Cc: Fabio Estevam, jic23, shawn.guo, linux-iio, Fabio Estevam
On 07/10/2013 12:43 PM, Marek Vasut wrote:
> Dear Fabio Estevam,
>
>> From: Fabio Estevam <fabio.estevam@freescale.com>
>>
>> stmp_reset_block() may fail, so let's check its return value and propagate
>> it in the case of error.
>>
>> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
>> ---
>> drivers/staging/iio/adc/mxs-lradc.c | 12 +++++++++---
>> 1 file changed, 9 insertions(+), 3 deletions(-)
>
> Acked-by: Marek Vasut <marex@denx.de>
Applied to the togreg branch of iio.git
Thanks,
>
> Best regards,
> Marek Vasut
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-07-12 19:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-10 2:36 [PATCH] iio: mxs-lradc: Check the return value from stmp_reset_block() Fabio Estevam
2013-07-10 11:43 ` Marek Vasut
2013-07-12 19:44 ` Jonathan Cameron
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.