diff options
| author | Vlad Dogaru <vlad.dogaru@intel.com> | 2015-06-30 14:20:58 +0300 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2015-07-05 14:02:19 +0100 |
| commit | 657c7ff56f8e96d4de7146103f08f3316dd822df (patch) | |
| tree | 24190101f5c2ac1f13ba438732d845bb9e55e4b3 /drivers/iio/proximity/sx9500.c | |
| parent | 2616dfa1d3061b02c3cbce60bc1a59281eccae31 (diff) | |
| download | linux-stable-657c7ff56f8e96d4de7146103f08f3316dd822df.tar.gz linux-stable-657c7ff56f8e96d4de7146103f08f3316dd822df.tar.bz2 linux-stable-657c7ff56f8e96d4de7146103f08f3316dd822df.zip | |
iio: sx9500: rework error handling of raw readings
Fix error handling so that we can power the chip down even if a raw read
fails.
Reported-by: Hartmut Knaack <knaack.h@gmx.de>
Signed-off-by: Vlad Dogaru <vlad.dogaru@intel.com>
Acked-by: Hartmut Knaack <knaack.h@gmx.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio/proximity/sx9500.c')
| -rw-r--r-- | drivers/iio/proximity/sx9500.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/iio/proximity/sx9500.c b/drivers/iio/proximity/sx9500.c index 2042e375f835..ba1cbbea22d7 100644 --- a/drivers/iio/proximity/sx9500.c +++ b/drivers/iio/proximity/sx9500.c @@ -329,27 +329,29 @@ static int sx9500_read_proximity(struct sx9500_data *data, else ret = sx9500_wait_for_sample(data); - if (ret < 0) - return ret; - mutex_lock(&data->mutex); - ret = sx9500_read_prox_data(data, chan, val); if (ret < 0) - goto out; + goto out_dec_data_rdy; - ret = sx9500_dec_chan_users(data, chan->channel); + ret = sx9500_read_prox_data(data, chan, val); if (ret < 0) - goto out; + goto out_dec_data_rdy; ret = sx9500_dec_data_rdy_users(data); if (ret < 0) + goto out_dec_chan; + + ret = sx9500_dec_chan_users(data, chan->channel); + if (ret < 0) goto out; ret = IIO_VAL_INT; goto out; +out_dec_data_rdy: + sx9500_dec_data_rdy_users(data); out_dec_chan: sx9500_dec_chan_users(data, chan->channel); out: |