diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-12-01 01:02:04 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-12-01 01:02:04 +0800 |
| commit | 0f646885c342e74051e3d40acd40af310469526d (patch) | |
| tree | d584727a1b291b524f5dde014725c53baa02b5f1 /drivers/staging | |
| parent | 00236b01de65d53e3cde74900c7b0be059abcf6b (diff) | |
| parent | 81ab793d6dcb61c8ca908b442cc7b98be7ffa02c (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/iio/cdc/ad7150.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/iio/cdc/ad7150.c b/drivers/staging/iio/cdc/ad7150.c index e8d0ff2d5c9b..808d6ebf6c94 100644 --- a/drivers/staging/iio/cdc/ad7150.c +++ b/drivers/staging/iio/cdc/ad7150.c @@ -272,7 +272,7 @@ static int ad7150_write_event_config(struct iio_dev *indio_dev, error_ret: mutex_unlock(&chip->state_lock); - return 0; + return ret; } static int ad7150_read_event_value(struct iio_dev *indio_dev, |