openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: iio: adc: ad7280a: fix overwrite of the returned value 

The ret returned from ad7280_chain_setup() is needed to initialize the
slave_num. Don't overwrite it with call to devm_add_action_or_reset().

Fixes: cc9c58ef6e ("staging: iio: adc: ad7280a: use devm_* APIs")
Signed-off-by: Slawomir Stepien <sst@poczta.fm>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Slawomir Stepien 2018-12-02 12:42:35 +01:00 committed by Jonathan Cameron
parent 53e8785c24
commit 794e20ee03
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/iio/adc/ad7280a.c
View File

@ -879,15 +879,15 @@ static int ad7280_probe(struct spi_device *spi)
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = devm_add_action_or_reset(&spi->dev, ad7280_sw_power_down, st);
if (ret)
return ret;
st->slave_num = ret; st->slave_num = ret;
st->scan_cnt = (st->slave_num + 1) * AD7280A_NUM_CH; st->scan_cnt = (st->slave_num + 1) * AD7280A_NUM_CH;
st->cell_threshhigh = 0xFF; st->cell_threshhigh = 0xFF;
st->aux_threshhigh = 0xFF; st->aux_threshhigh = 0xFF;
ret = devm_add_action_or_reset(&spi->dev, ad7280_sw_power_down, st);
if (ret)
return ret;
/* /*
* Total Conversion Time = ((tACQ + tCONV) * * Total Conversion Time = ((tACQ + tCONV) *
* (Number of Conversions per Part)) − * (Number of Conversions per Part)) −