summaryrefslogtreecommitdiffstats
path: root/drivers/iio/pressure
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-14 00:35:56 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-14 00:35:56 +0200
commit589e1d10ff27c61669cc74a43620e6e769ea79dd (patch)
tree63c23b1407944f136b44949c7b03da74823ae757 /drivers/iio/pressure
parentMerge tag 'iio-for-3.17c' of git://git.kernel.org/pub/scm/linux/kernel/git/ji... (diff)
parentLinux 3.16-rc5 (diff)
downloadlinux-589e1d10ff27c61669cc74a43620e6e769ea79dd.tar.xz
linux-589e1d10ff27c61669cc74a43620e6e769ea79dd.zip
Merge 3.16-rc5 into staging-next
We want the fixes in -rc5 in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/pressure')
-rw-r--r--drivers/iio/pressure/hid-sensor-press.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/iio/pressure/hid-sensor-press.c b/drivers/iio/pressure/hid-sensor-press.c
index 1cd190c73788..2c0d2a4fed8c 100644
--- a/drivers/iio/pressure/hid-sensor-press.c
+++ b/drivers/iio/pressure/hid-sensor-press.c
@@ -78,7 +78,6 @@ static int press_read_raw(struct iio_dev *indio_dev,
struct press_state *press_state = iio_priv(indio_dev);
int report_id = -1;
u32 address;
- int ret;
int ret_type;
s32 poll_value;
@@ -128,14 +127,12 @@ static int press_read_raw(struct iio_dev *indio_dev,
ret_type = IIO_VAL_INT;
break;
case IIO_CHAN_INFO_SAMP_FREQ:
- ret = hid_sensor_read_samp_freq_value(
+ ret_type = hid_sensor_read_samp_freq_value(
&press_state->common_attributes, val, val2);
- ret_type = IIO_VAL_INT_PLUS_MICRO;
break;
case IIO_CHAN_INFO_HYSTERESIS:
- ret = hid_sensor_read_raw_hyst_value(
+ ret_type = hid_sensor_read_raw_hyst_value(
&press_state->common_attributes, val, val2);
- ret_type = IIO_VAL_INT_PLUS_MICRO;
break;
default:
ret_type = -EINVAL;