Merge tag 'iio-fixes-for-4.9b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus

Second set of IIO fixes for the 4.9 cycle.

Interestingly scale related fixes for accelerometers at both ends of
the range.  Obviously more varied devices turning up than we've seen before!

* ad5933
  - fix an uninitialized value in a return case that is winding up GCC.
* hid sensors
  - missing pm function prevents hid rotations sensors from working on newer
  ISH hubs (works by luck on older ones)
  - increase of scale precision needed to fix a case where on a yoga 260
  the reported scale is 0 (presumably a high precision but very low g sensor).
* st_sensors
  - fix an issue seen with the hs3lis331dl where the range is much greater
  than previous devices (100's of g) and hence the per bit scale is greater
  than 1.

1 files changed, 10 insertions, 7 deletions

diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c
index 5eecf1cb1028..3892a7470410 100644
--- a/drivers/staging/iio/impedance-analyzer/ad5933.c
+++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
@@ -655,6 +655,7 @@ static void ad5933_work(struct work_struct *work)
         __be16 buf[2];
         int val[2];
         unsigned char status;
+        int ret;
 
         mutex_lock(&indio_dev->mlock);
         if (st->state == AD5933_CTRL_INIT_START_FREQ) {
@@ -662,19 +663,22 @@ static void ad5933_work(struct work_struct *work)
                 ad5933_cmd(st, AD5933_CTRL_START_SWEEP);
                 st->state = AD5933_CTRL_START_SWEEP;
                 schedule_delayed_work(&st->work, st->poll_time_jiffies);
-                mutex_unlock(&indio_dev->mlock);
-                return;
+                goto out;
         }
 
-        ad5933_i2c_read(st->client, AD5933_REG_STATUS, 1, &status);
+        ret = ad5933_i2c_read(st->client, AD5933_REG_STATUS, 1, &status);
+        if (ret)
+                goto out;
 
         if (status & AD5933_STAT_DATA_VALID) {
                 int scan_count = bitmap_weight(indio_dev->active_scan_mask,
                                                indio_dev->masklength);
-                ad5933_i2c_read(st->client,
+                ret = ad5933_i2c_read(st->client,
                                 test_bit(1, indio_dev->active_scan_mask) ?
                                 AD5933_REG_REAL_DATA : AD5933_REG_IMAG_DATA,
                                 scan_count * 2, (u8 *)buf);
+                if (ret)
+                        goto out;
 
                 if (scan_count == 2) {
                         val[0] = be16_to_cpu(buf[0]);
@@ -686,8 +690,7 @@ static void ad5933_work(struct work_struct *work)
         } else {
                 /* no data available - try again later */
                 schedule_delayed_work(&st->work, st->poll_time_jiffies);
-                mutex_unlock(&indio_dev->mlock);
-                return;
+                goto out;
         }
 
         if (status & AD5933_STAT_SWEEP_DONE) {
@@ -700,7 +703,7 @@ static void ad5933_work(struct work_struct *work)
                 ad5933_cmd(st, AD5933_CTRL_INC_FREQ);
                 schedule_delayed_work(&st->work, st->poll_time_jiffies);
         }
-
+out:
         mutex_unlock(&indio_dev->mlock);
 }