diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-09 09:33:29 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-09 09:33:29 +0200 |
| commit | eca743dc37e1018decfb307d564387477c1ac4fd (patch) | |
| tree | c677f8d30f294a8c803963d555bb08a8dcd59ee5 /drivers/iio/temperature | |
| parent | f86cf25a609107960cf05263e491463feaae1f99 (diff) | |
| parent | a13bf65f3f2e36008ea60b49d3bda2527e09fd9c (diff) | |
| download | linux-stable-eca743dc37e1018decfb307d564387477c1ac4fd.tar.gz linux-stable-eca743dc37e1018decfb307d564387477c1ac4fd.tar.bz2 linux-stable-eca743dc37e1018decfb307d564387477c1ac4fd.zip | |
Merge tag 'iio-fixes-4.19a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
Jonathan writes:
First set of IIO fixes for the 4.19 cycle.
* ad9523
- sysfs write should return the number of characters used or an error, not
0 which could result in an infinite loop in userspace.
* lsm6dsx
- Fix computation of length when updating the watermark to include
timestamps avoiding the watermark being set earlier than intended.
* maxim_thermocouple
- Revert a patch adding the max31856 as it's not actually compatible with
the register set that this driver supports.
* si1133
- Fix an impossible value check so we don't always error out whether the
passed in value is good or bad.
Diffstat (limited to 'drivers/iio/temperature')
| -rw-r--r-- | drivers/iio/temperature/maxim_thermocouple.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/iio/temperature/maxim_thermocouple.c b/drivers/iio/temperature/maxim_thermocouple.c index 54e383231d1e..c31b9633f32d 100644 --- a/drivers/iio/temperature/maxim_thermocouple.c +++ b/drivers/iio/temperature/maxim_thermocouple.c @@ -258,7 +258,6 @@ static int maxim_thermocouple_remove(struct spi_device *spi) static const struct spi_device_id maxim_thermocouple_id[] = { {"max6675", MAX6675}, {"max31855", MAX31855}, - {"max31856", MAX31855}, {}, }; MODULE_DEVICE_TABLE(spi, maxim_thermocouple_id); |