diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-06 15:27:17 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-06 15:27:17 +0100 |
| commit | e8cd29b774ddd28bfe6d693c82241e294dc91e09 (patch) | |
| tree | c8f904220eab7c50771558642b6c6d9240fb5368 /drivers/iio/health | |
| parent | 7e739297cdbe8383bf4a5e423959107eccc01fa1 (diff) | |
| parent | 73996933b53ff396d63a7fccd8e824758634dc19 (diff) | |
Merge Linus's staging merge point into staging-next
This resolves the merge issue pointed out by Stephen in
drivers/iio/adc/meson_saradc.c.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/health')
| -rw-r--r-- | drivers/iio/health/max30102.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/health/max30102.c b/drivers/iio/health/max30102.c index 490dfbaf35ac..15ccadc74891 100644 --- a/drivers/iio/health/max30102.c +++ b/drivers/iio/health/max30102.c @@ -497,7 +497,7 @@ static int max30102_read_raw(struct iio_dev *indio_dev, ret = IIO_VAL_INT; break; case IIO_CHAN_INFO_SCALE: - *val = 1; /* 0.0625 */ + *val = 1000; /* 62.5 */ *val2 = 16; ret = IIO_VAL_FRACTIONAL; break; |