diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-11-05 09:36:29 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-11-05 09:36:29 +0100 |
commit | 9365f0de4303f82ed4c2db1c39d3de824b249d80 (patch) | |
tree | 2429440aa61c31608557adae2d8fd9228dee7622 /drivers/iio/adc/ad7124.c | |
parent | f36ee841165b2234db8346eb8d5381626e5ab524 (diff) | |
parent | 59b723cd2adbac2a34fc8e12c74ae26ae45bf230 (diff) | |
download | lwn-9365f0de4303f82ed4c2db1c39d3de824b249d80.tar.gz lwn-9365f0de4303f82ed4c2db1c39d3de824b249d80.zip |
Merge 6.12-rc6 into char-misc-next
We need the char/misc/iio fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/adc/ad7124.c')
-rw-r--r-- | drivers/iio/adc/ad7124.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/adc/ad7124.c b/drivers/iio/adc/ad7124.c index a5d91933f505..b79c48d46ccc 100644 --- a/drivers/iio/adc/ad7124.c +++ b/drivers/iio/adc/ad7124.c @@ -637,7 +637,7 @@ static int ad7124_write_raw(struct iio_dev *indio_dev, switch (info) { case IIO_CHAN_INFO_SAMP_FREQ: - if (val2 != 0) { + if (val2 != 0 || val == 0) { ret = -EINVAL; break; } |