summaryrefslogtreecommitdiffstats
path: root/drivers/iio/temperature
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-11-17 08:30:54 +0100
committerIngo Molnar <mingo@kernel.org>2016-11-17 08:30:54 +0100
commit89a01c51cbe3b6ae81008e8c91235be583df8c50 (patch)
tree0f2e42652d8ebdfc6aeaa8f7c1b5b834f4a5d649 /drivers/iio/temperature
parentf4474c9f0bba17857b1a47c8dc89c07a0845c2b2 (diff)
parenta8d9df5a509a232a959e4ef2e281f7ecd77810d6 (diff)
downloadtalos-op-linux-89a01c51cbe3b6ae81008e8c91235be583df8c50.tar.gz
talos-op-linux-89a01c51cbe3b6ae81008e8c91235be583df8c50.zip
Merge branch 'x86/cpufeature' into x86/asm, to pick up dependency
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/iio/temperature')
-rw-r--r--drivers/iio/temperature/maxim_thermocouple.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/iio/temperature/maxim_thermocouple.c b/drivers/iio/temperature/maxim_thermocouple.c
index 066161a4bccd..f962f31a5eb2 100644
--- a/drivers/iio/temperature/maxim_thermocouple.c
+++ b/drivers/iio/temperature/maxim_thermocouple.c
@@ -136,6 +136,8 @@ static int maxim_thermocouple_read(struct maxim_thermocouple_data *data,
ret = spi_read(data->spi, (void *)&buf32, storage_bytes);
*val = be32_to_cpu(buf32);
break;
+ default:
+ ret = -EINVAL;
}
if (ret)
OpenPOWER on IntegriCloud