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>

1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/iio/magnetometer/hid-sensor-magn-3d.c b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
index 41cf29e2a371..b2b0937d5133 100644
--- a/drivers/iio/magnetometer/hid-sensor-magn-3d.c
+++ b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
@@ -110,7 +110,6 @@ static int magn_3d_read_raw(struct iio_dev *indio_dev,
         struct magn_3d_state *magn_state = iio_priv(indio_dev);
         int report_id = -1;
         u32 address;
-        int ret;
         int ret_type;
         s32 poll_value;
 
@@ -153,14 +152,12 @@ static int magn_3d_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(
                         &magn_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(
                         &magn_state->common_attributes, val, val2);
-                ret_type = IIO_VAL_INT_PLUS_MICRO;
                 break;
         default:
                 ret_type = -EINVAL;