diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-08-23 12:31:58 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-08-23 12:31:58 +0800 |
| commit | 5580dff37b9e49623399cb253a7cbef82d9f776a (patch) | |
| tree | 2ec65f56daacb74da580fee7394334aa5e92aee2 /drivers/staging | |
| parent | 98fb754c57ea86c1ea5f18a82568f620d748c1bc (diff) | |
| parent | 99f614a3bb23603a947be2e95b78507112c484e5 (diff) | |
Merge tag 'v4.1.31' into linux-linaro-lsk-v4.1
This is the 4.1.31 stable release
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/iio/accel/sca3000_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/iio/accel/sca3000_core.c b/drivers/staging/iio/accel/sca3000_core.c index b614f272b5f4..851fcfa98068 100644 --- a/drivers/staging/iio/accel/sca3000_core.c +++ b/drivers/staging/iio/accel/sca3000_core.c @@ -595,7 +595,7 @@ static ssize_t sca3000_read_frequency(struct device *dev, goto error_ret_mut; ret = sca3000_read_ctrl_reg(st, SCA3000_REG_CTRL_SEL_OUT_CTRL); mutex_unlock(&st->lock); - if (ret) + if (ret < 0) goto error_ret; val = ret; if (base_freq > 0) |