diff options
| author |   Etienne Carriere <etienne.carriere@st.com> | 2020-01-13 14:14:26 +0100 |
|---|---|---|
| committer |   Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2020-01-18 14:32:01 +0000 |
| commit | d344961f55fd6321937d3bc92ad3930dea31189f (patch) | |
| tree | d4736fa663aebd430adcd349b8b4310270df7a0c /drivers/iio | |
| parent | iio: dac: stm32-dac: use reset controller only at probe time (diff) | |
| download | linux-dev-d344961f55fd6321937d3bc92ad3930dea31189f.tar.xz linux-dev-d344961f55fd6321937d3bc92ad3930dea31189f.zip | |
iio: dac: stm32-dac: better handle reset controller failures
Use devm_reset_control_get_optional_exclusive() instead of
devm_reset_control_get_exclusive() as reset controller is optional.
Nevertheless if reset controller is expected but reports an
error, propagate the error code to the caller. In such case
a nice error trace is emitted unless we're deferring the probe
operation.
Signed-off-by: Etienne Carriere <etienne.carriere@st.com>
Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Diffstat (limited to 'drivers/iio')
| -rw-r--r-- | drivers/iio/dac/stm32-dac-core.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/iio/dac/stm32-dac-core.c b/drivers/iio/dac/stm32-dac-core.c index 4d93446c58f5..7e5809ba0dee 100644 --- a/drivers/iio/dac/stm32-dac-core.c +++ b/drivers/iio/dac/stm32-dac-core.c @@ -147,8 +147,16 @@ static int stm32_dac_probe(struct platform_device *pdev) priv->common.vref_mv = ret / 1000; dev_dbg(dev, "vref+=%dmV\n", priv->common.vref_mv); - rst = devm_reset_control_get_exclusive(dev, NULL); - if (!IS_ERR(rst)) { + rst = devm_reset_control_get_optional_exclusive(dev, NULL); + if (rst) { + if (IS_ERR(rst)) { + ret = PTR_ERR(rst); + if (ret != -EPROBE_DEFER) + dev_err(dev, "reset get failed, %d\n", ret); + + goto err_hw_stop; + } + reset_control_assert(rst); udelay(2); reset_control_deassert(rst); |