diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-16 09:02:59 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-16 09:02:59 +0200 |
| commit | a30514a076cfe4b1962980e946a759f5556cf4a5 (patch) | |
| tree | bd1238ee26ffaa2940f536da52e77eb576f87549 /drivers/iio/accel | |
| parent | f805ef1ce5d695c260986fdf2e28f5d6c98cf3a8 (diff) | |
| parent | 7c60610d476766e128cc4284bb6349732cbd6606 (diff) | |
Merge 5.14-rc6 into staging-next
We need the IIO fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/accel')
| -rw-r--r-- | drivers/iio/accel/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/iio/accel/fxls8962af-core.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig index 2f0c0d512ae7..a0e9061f6d6b 100644 --- a/drivers/iio/accel/Kconfig +++ b/drivers/iio/accel/Kconfig @@ -232,6 +232,7 @@ config DMARD10 config FXLS8962AF tristate + depends on I2C || !I2C # cannot be built-in for modular I2C config FXLS8962AF_I2C tristate "NXP FXLS8962AF/FXLS8964AF Accelerometer I2C Driver" @@ -248,6 +249,7 @@ config FXLS8962AF_I2C config FXLS8962AF_SPI tristate "NXP FXLS8962AF/FXLS8964AF Accelerometer SPI Driver" depends on SPI + depends on I2C || !I2C select FXLS8962AF select REGMAP_SPI help diff --git a/drivers/iio/accel/fxls8962af-core.c b/drivers/iio/accel/fxls8962af-core.c index 078d87865fde..0019f1ea7df2 100644 --- a/drivers/iio/accel/fxls8962af-core.c +++ b/drivers/iio/accel/fxls8962af-core.c @@ -637,7 +637,7 @@ static int fxls8962af_i2c_raw_read_errata3(struct fxls8962af_data *data, return ret; } - return ret; + return 0; } static int fxls8962af_fifo_transfer(struct fxls8962af_data *data, |