diff options
| author | Greg Kroah-Hartman | 2016-02-08 02:34:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2016-02-08 02:34:04 +0100 |
| commit | 5ba907a949562cd4839b0170a13dda6841055e70 (patch) | |
| tree | 32d7ab834753779d3e1216a3a251c8c2fb097438 /drivers/iio/pressure/mpl115.c | |
| parent | staging: wilc1000: fix build failure (diff) | |
| parent | Linux 4.5-rc3 (diff) | |
| download | kernel-qcow2-linux-5ba907a949562cd4839b0170a13dda6841055e70.tar.gz kernel-qcow2-linux-5ba907a949562cd4839b0170a13dda6841055e70.tar.xz kernel-qcow2-linux-5ba907a949562cd4839b0170a13dda6841055e70.zip | |
Merge 4.5-rc3 into staging-next
We want the upstream staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/pressure/mpl115.c')
| -rw-r--r-- | drivers/iio/pressure/mpl115.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/pressure/mpl115.c b/drivers/iio/pressure/mpl115.c index 138344ca3ffd..73f2f0c46e62 100644 --- a/drivers/iio/pressure/mpl115.c +++ b/drivers/iio/pressure/mpl115.c @@ -118,7 +118,7 @@ static int mpl115_read_raw(struct iio_dev *indio_dev, *val = ret >> 6; return IIO_VAL_INT; case IIO_CHAN_INFO_OFFSET: - *val = 605; + *val = -605; *val2 = 750000; return IIO_VAL_INT_PLUS_MICRO; case IIO_CHAN_INFO_SCALE: |