Merge tag 'staging-4.20-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging and IIO driver fixes from Greg KH:
 "Here are some small IIO and staging driver fixes for 4.20-rc5.

  Nothing major, the IIO fix ended up touching the HID drivers at the
  same time, but the HID maintainer acked it. The staging fixes are all
  minor patches for reported issues and regressions, full details are in
  the shortlog.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'staging-4.20-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  iio/hid-sensors: Fix IIO_CHAN_INFO_RAW returning wrong values for signed numbers
  staging: vchiq_arm: fix compat VCHIQ_IOC_AWAIT_COMPLETION
  staging: mt7621-pinctrl: fix uninitialized variable ngroups
  staging: rtl8723bs: Add missing return for cfg80211_rtw_get_station
  staging: most: use format specifier "%s" in snprintf
  staging: rtl8723bs: Fix incorrect sense of ether_addr_equal
  staging: mt7621-dma: fix potentially dereferencing uninitialized 'tx_desc'
  staging: comedi: clarify/unify macros for NI macro-defined terminals
  drivers: staging: cedrus: find ctx before dereferencing it ctx
  staging: rtl8723bs: Fix the return value in case of error in 'rtw_wx_read32()'
  staging: comedi: ni_mio_common: scale ao INSN_CONFIG_GET_CMD_TIMING_CONSTRAINTS
  iio:st_magn: Fix enable device after trigger

24 files changed, 103 insertions, 72 deletions

diff --git a/drivers/hid/hid-sensor-custom.c b/drivers/hid/hid-sensor-custom.c
index e8a114157f87..bb012bc032e0 100644
--- a/drivers/hid/hid-sensor-custom.c
+++ b/drivers/hid/hid-sensor-custom.c
@@ -358,7 +358,7 @@ static ssize_t show_value(struct device *dev, struct device_attribute *attr,
                                                 sensor_inst->hsdev,
                                                 sensor_inst->hsdev->usage,
                                                 usage, report_id,
-                                                SENSOR_HUB_SYNC);
+                                                SENSOR_HUB_SYNC, false);
         } else if (!strncmp(name, "units", strlen("units")))
                 value = sensor_inst->fields[field_index].attribute.units;
         else if (!strncmp(name, "unit-expo", strlen("unit-expo")))
diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c
index 2b63487057c2..4256fdc5cd6d 100644
--- a/drivers/hid/hid-sensor-hub.c
+++ b/drivers/hid/hid-sensor-hub.c
@@ -299,7 +299,8 @@ EXPORT_SYMBOL_GPL(sensor_hub_get_feature);
 int sensor_hub_input_attr_get_raw_value(struct hid_sensor_hub_device *hsdev,
                                         u32 usage_id,
                                         u32 attr_usage_id, u32 report_id,
-                                        enum sensor_hub_read_flags flag)
+                                        enum sensor_hub_read_flags flag,
+                                        bool is_signed)
 {
         struct sensor_hub_data *data = hid_get_drvdata(hsdev->hdev);
         unsigned long flags;
@@ -331,10 +332,16 @@ int sensor_hub_input_attr_get_raw_value(struct hid_sensor_hub_device *hsdev,
                                                 &hsdev->pending.ready, HZ*5);
                 switch (hsdev->pending.raw_size) {
                 case 1:
-                        ret_val = *(u8 *)hsdev->pending.raw_data;
+                        if (is_signed)
+                                ret_val = *(s8 *)hsdev->pending.raw_data;
+                        else
+                                ret_val = *(u8 *)hsdev->pending.raw_data;
                         break;
                 case 2:
-                        ret_val = *(u16 *)hsdev->pending.raw_data;
+                        if (is_signed)
+                                ret_val = *(s16 *)hsdev->pending.raw_data;
+                        else
+                                ret_val = *(u16 *)hsdev->pending.raw_data;
                         break;
                 case 4:
                         ret_val = *(u32 *)hsdev->pending.raw_data;
diff --git a/drivers/iio/accel/hid-sensor-accel-3d.c b/drivers/iio/accel/hid-sensor-accel-3d.c
index 41d97faf5013..38ff374a3ca4 100644
--- a/drivers/iio/accel/hid-sensor-accel-3d.c
+++ b/drivers/iio/accel/hid-sensor-accel-3d.c
@@ -149,6 +149,7 @@ static int accel_3d_read_raw(struct iio_dev *indio_dev,
         int report_id = -1;
         u32 address;
         int ret_type;
+        s32 min;
         struct hid_sensor_hub_device *hsdev =
                                         accel_state->common_attributes.hsdev;
 
@@ -158,12 +159,14 @@ static int accel_3d_read_raw(struct iio_dev *indio_dev,
         case IIO_CHAN_INFO_RAW:
                 hid_sensor_power_state(&accel_state->common_attributes, true);
                 report_id = accel_state->accel[chan->scan_index].report_id;
+                min = accel_state->accel[chan->scan_index].logical_minimum;
                 address = accel_3d_addresses[chan->scan_index];
                 if (report_id >= 0)
                         *val = sensor_hub_input_attr_get_raw_value(
                                         accel_state->common_attributes.hsdev,
                                         hsdev->usage, address, report_id,
-                                        SENSOR_HUB_SYNC);
+                                        SENSOR_HUB_SYNC,
+                                        min < 0);
                 else {
                         *val = 0;
                         hid_sensor_power_state(&accel_state->common_attributes,
diff --git a/drivers/iio/gyro/hid-sensor-gyro-3d.c b/drivers/iio/gyro/hid-sensor-gyro-3d.c
index 36941e69f959..88e857c4baf4 100644
--- a/drivers/iio/gyro/hid-sensor-gyro-3d.c
+++ b/drivers/iio/gyro/hid-sensor-gyro-3d.c
@@ -111,6 +111,7 @@ static int gyro_3d_read_raw(struct iio_dev *indio_dev,
         int report_id = -1;
         u32 address;
         int ret_type;
+        s32 min;
 
         *val = 0;
         *val2 = 0;
@@ -118,13 +119,15 @@ static int gyro_3d_read_raw(struct iio_dev *indio_dev,
         case IIO_CHAN_INFO_RAW:
                 hid_sensor_power_state(&gyro_state->common_attributes, true);
                 report_id = gyro_state->gyro[chan->scan_index].report_id;
+                min = gyro_state->gyro[chan->scan_index].logical_minimum;
                 address = gyro_3d_addresses[chan->scan_index];
                 if (report_id >= 0)
                         *val = sensor_hub_input_attr_get_raw_value(
                                         gyro_state->common_attributes.hsdev,
                                         HID_USAGE_SENSOR_GYRO_3D, address,
                                         report_id,
-                                        SENSOR_HUB_SYNC);
+                                        SENSOR_HUB_SYNC,
+                                        min < 0);
                 else {
                         *val = 0;
                         hid_sensor_power_state(&gyro_state->common_attributes,
diff --git a/drivers/iio/humidity/hid-sensor-humidity.c b/drivers/iio/humidity/hid-sensor-humidity.c
index beab6d6fd6e1..4bc95f31c730 100644
--- a/drivers/iio/humidity/hid-sensor-humidity.c
+++ b/drivers/iio/humidity/hid-sensor-humidity.c
@@ -75,7 +75,8 @@ static int humidity_read_raw(struct iio_dev *indio_dev,
                                 HID_USAGE_SENSOR_HUMIDITY,
                                 HID_USAGE_SENSOR_ATMOSPHERIC_HUMIDITY,
                                 humid_st->humidity_attr.report_id,
-                                SENSOR_HUB_SYNC);
+                                SENSOR_HUB_SYNC,
+                                humid_st->humidity_attr.logical_minimum < 0);
                 hid_sensor_power_state(&humid_st->common_attributes, false);
 
                 return IIO_VAL_INT;
diff --git a/drivers/iio/light/hid-sensor-als.c b/drivers/iio/light/hid-sensor-als.c
index 406caaee9a3c..94f33250ba5a 100644
--- a/drivers/iio/light/hid-sensor-als.c
+++ b/drivers/iio/light/hid-sensor-als.c
@@ -93,6 +93,7 @@ static int als_read_raw(struct iio_dev *indio_dev,
         int report_id = -1;
         u32 address;
         int ret_type;
+        s32 min;
 
         *val = 0;
         *val2 = 0;
@@ -102,8 +103,8 @@ static int als_read_raw(struct iio_dev *indio_dev,
                 case  CHANNEL_SCAN_INDEX_INTENSITY:
                 case  CHANNEL_SCAN_INDEX_ILLUM:
                         report_id = als_state->als_illum.report_id;
-                        address =
-                        HID_USAGE_SENSOR_LIGHT_ILLUM;
+                        min = als_state->als_illum.logical_minimum;
+                        address = HID_USAGE_SENSOR_LIGHT_ILLUM;
                         break;
                 default:
                         report_id = -1;
@@ -116,7 +117,8 @@ static int als_read_raw(struct iio_dev *indio_dev,
                                         als_state->common_attributes.hsdev,
                                         HID_USAGE_SENSOR_ALS, address,
                                         report_id,
-                                        SENSOR_HUB_SYNC);
+                                        SENSOR_HUB_SYNC,
+                                        min < 0);
                         hid_sensor_power_state(&als_state->common_attributes,
                                                 false);
                 } else {
diff --git a/drivers/iio/light/hid-sensor-prox.c b/drivers/iio/light/hid-sensor-prox.c
index 45107f7537b5..cf5a0c242609 100644
--- a/drivers/iio/light/hid-sensor-prox.c
+++ b/drivers/iio/light/hid-sensor-prox.c
@@ -73,6 +73,7 @@ static int prox_read_raw(struct iio_dev *indio_dev,
         int report_id = -1;
         u32 address;
         int ret_type;
+        s32 min;
 
         *val = 0;
         *val2 = 0;
@@ -81,8 +82,8 @@ static int prox_read_raw(struct iio_dev *indio_dev,
                 switch (chan->scan_index) {
                 case  CHANNEL_SCAN_INDEX_PRESENCE:
                         report_id = prox_state->prox_attr.report_id;
-                        address =
-                        HID_USAGE_SENSOR_HUMAN_PRESENCE;
+                        min = prox_state->prox_attr.logical_minimum;
+                        address = HID_USAGE_SENSOR_HUMAN_PRESENCE;
                         break;
                 default:
                         report_id = -1;
@@ -95,7 +96,8 @@ static int prox_read_raw(struct iio_dev *indio_dev,
                                 prox_state->common_attributes.hsdev,
                                 HID_USAGE_SENSOR_PROX, address,
                                 report_id,
-                                SENSOR_HUB_SYNC);
+                                SENSOR_HUB_SYNC,
+                                min < 0);
                         hid_sensor_power_state(&prox_state->common_attributes,
                                                 false);
                 } else {
diff --git a/drivers/iio/magnetometer/hid-sensor-magn-3d.c b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
index d55c4885211a..f3c0d41e5a8c 100644
--- a/drivers/iio/magnetometer/hid-sensor-magn-3d.c
+++ b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
@@ -163,21 +163,23 @@ static int magn_3d_read_raw(struct iio_dev *indio_dev,
         int report_id = -1;
         u32 address;
         int ret_type;
+        s32 min;
 
         *val = 0;
         *val2 = 0;
         switch (mask) {
         case IIO_CHAN_INFO_RAW:
                 hid_sensor_power_state(&magn_state->magn_flux_attributes, true);
-                report_id =
-                        magn_state->magn[chan->address].report_id;
+                report_id = magn_state->magn[chan->address].report_id;
+                min = magn_state->magn[chan->address].logical_minimum;
                 address = magn_3d_addresses[chan->address];
                 if (report_id >= 0)
                         *val = sensor_hub_input_attr_get_raw_value(
                                 magn_state->magn_flux_attributes.hsdev,
                                 HID_USAGE_SENSOR_COMPASS_3D, address,
                                 report_id,
-                                SENSOR_HUB_SYNC);
+                                SENSOR_HUB_SYNC,
+                                min < 0);
                 else {
                         *val = 0;
                         hid_sensor_power_state(
diff --git a/drivers/iio/magnetometer/st_magn_buffer.c b/drivers/iio/magnetometer/st_magn_buffer.c
index 0a9e8fadfa9d..37ab30566464 100644
--- a/drivers/iio/magnetometer/st_magn_buffer.c
+++ b/drivers/iio/magnetometer/st_magn_buffer.c
@@ -30,11 +30,6 @@ int st_magn_trig_set_state(struct iio_trigger *trig, bool state)
         return st_sensors_set_dataready_irq(indio_dev, state);
 }
 
-static int st_magn_buffer_preenable(struct iio_dev *indio_dev)
-{
-        return st_sensors_set_enable(indio_dev, true);
-}
-
 static int st_magn_buffer_postenable(struct iio_dev *indio_dev)
 {
         int err;
@@ -50,7 +45,7 @@ static int st_magn_buffer_postenable(struct iio_dev *indio_dev)
         if (err < 0)
                 goto st_magn_buffer_postenable_error;
 
-        return err;
+        return st_sensors_set_enable(indio_dev, true);
 
 st_magn_buffer_postenable_error:
         kfree(mdata->buffer_data);
@@ -63,11 +58,11 @@ static int st_magn_buffer_predisable(struct iio_dev *indio_dev)
         int err;
         struct st_sensor_data *mdata = iio_priv(indio_dev);
 
-        err = iio_triggered_buffer_predisable(indio_dev);
+        err = st_sensors_set_enable(indio_dev, false);
         if (err < 0)
                 goto st_magn_buffer_predisable_error;
 
-        err = st_sensors_set_enable(indio_dev, false);
+        err = iio_triggered_buffer_predisable(indio_dev);
 
 st_magn_buffer_predisable_error:
         kfree(mdata->buffer_data);
@@ -75,7 +70,6 @@ st_magn_buffer_predisable_error:
 }
 
 static const struct iio_buffer_setup_ops st_magn_buffer_setup_ops = {
-        .preenable = &st_magn_buffer_preenable,
         .postenable = &st_magn_buffer_postenable,
         .predisable = &st_magn_buffer_predisable,
 };
diff --git a/drivers/iio/orientation/hid-sensor-incl-3d.c b/drivers/iio/orientation/hid-sensor-incl-3d.c
index 1e5451d1ff88..bdc5e4554ee4 100644
--- a/drivers/iio/orientation/hid-sensor-incl-3d.c
+++ b/drivers/iio/orientation/hid-sensor-incl-3d.c
@@ -111,21 +111,23 @@ static int incl_3d_read_raw(struct iio_dev *indio_dev,
         int report_id = -1;
         u32 address;
         int ret_type;
+        s32 min;
 
         *val = 0;
         *val2 = 0;
         switch (mask) {
         case IIO_CHAN_INFO_RAW:
                 hid_sensor_power_state(&incl_state->common_attributes, true);
-                report_id =
-                        incl_state->incl[chan->scan_index].report_id;
+                report_id = incl_state->incl[chan->scan_index].report_id;
+                min = incl_state->incl[chan->scan_index].logical_minimum;
                 address = incl_3d_addresses[chan->scan_index];
                 if (report_id >= 0)
                         *val = sensor_hub_input_attr_get_raw_value(
                                 incl_state->common_attributes.hsdev,
                                 HID_USAGE_SENSOR_INCLINOMETER_3D, address,
                                 report_id,
-                                SENSOR_HUB_SYNC);
+                                SENSOR_HUB_SYNC,
+                                min < 0);
                 else {
                         hid_sensor_power_state(&incl_state->common_attributes,
                                                 false);
diff --git a/drivers/iio/pressure/hid-sensor-press.c b/drivers/iio/pressure/hid-sensor-press.c
index 4c437918f1d2..d7b1c00ceb4d 100644
--- a/drivers/iio/pressure/hid-sensor-press.c
+++ b/drivers/iio/pressure/hid-sensor-press.c
@@ -77,6 +77,7 @@ static int press_read_raw(struct iio_dev *indio_dev,
         int report_id = -1;
         u32 address;
         int ret_type;
+        s32 min;
 
         *val = 0;
         *val2 = 0;
@@ -85,8 +86,8 @@ static int press_read_raw(struct iio_dev *indio_dev,
                 switch (chan->scan_index) {
                 case  CHANNEL_SCAN_INDEX_PRESSURE:
                         report_id = press_state->press_attr.report_id;
-                        address =
-                        HID_USAGE_SENSOR_ATMOSPHERIC_PRESSURE;
+                        min = press_state->press_attr.logical_minimum;
+                        address = HID_USAGE_SENSOR_ATMOSPHERIC_PRESSURE;
                         break;
                 default:
                         report_id = -1;
@@ -99,7 +100,8 @@ static int press_read_raw(struct iio_dev *indio_dev,
                                 press_state->common_attributes.hsdev,
                                 HID_USAGE_SENSOR_PRESSURE, address,
                                 report_id,
-                                SENSOR_HUB_SYNC);
+                                SENSOR_HUB_SYNC,
+                                min < 0);
                         hid_sensor_power_state(&press_state->common_attributes,
                                                 false);
                 } else {
diff --git a/drivers/iio/temperature/hid-sensor-temperature.c b/drivers/iio/temperature/hid-sensor-temperature.c
index beaf6fd3e337..b592fc4f007e 100644
--- a/drivers/iio/temperature/hid-sensor-temperature.c
+++ b/drivers/iio/temperature/hid-sensor-temperature.c
@@ -76,7 +76,8 @@ static int temperature_read_raw(struct iio_dev *indio_dev,
                         HID_USAGE_SENSOR_TEMPERATURE,
                         HID_USAGE_SENSOR_DATA_ENVIRONMENTAL_TEMPERATURE,
                         temp_st->temperature_attr.report_id,
-                        SENSOR_HUB_SYNC);
+                        SENSOR_HUB_SYNC,
+                        temp_st->temperature_attr.logical_minimum < 0);
                 hid_sensor_power_state(
                                 &temp_st->common_attributes,
                                 false);
diff --git a/drivers/rtc/rtc-hid-sensor-time.c b/drivers/rtc/rtc-hid-sensor-time.c
index 2751dba850c6..3e1abb455472 100644
--- a/drivers/rtc/rtc-hid-sensor-time.c
+++ b/drivers/rtc/rtc-hid-sensor-time.c
@@ -213,7 +213,7 @@ static int hid_rtc_read_time(struct device *dev, struct rtc_time *tm)
         /* get a report with all values through requesting one value */
         sensor_hub_input_attr_get_raw_value(time_state->common_attributes.hsdev,
                         HID_USAGE_SENSOR_TIME, hid_time_addresses[0],
-                        time_state->info[0].report_id, SENSOR_HUB_SYNC);
+                        time_state->info[0].report_id, SENSOR_HUB_SYNC, false);
         /* wait for all values (event) */
         ret = wait_for_completion_killable_timeout(
                         &time_state->comp_last_time, HZ*6);
diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h
index e90b17775284..09a940066c0e 100644
--- a/drivers/staging/comedi/comedi.h
+++ b/drivers/staging/comedi/comedi.h
@@ -1005,35 +1005,38 @@ enum i8254_mode {
  * and INSN_DEVICE_CONFIG_GET_ROUTES.
  */
 #define NI_NAMES_BASE   0x8000u
+
+#define _TERM_N(base, n, x)     ((base) + ((x) & ((n) - 1)))
+
 /*
  * not necessarily all allowed 64 PFIs are valid--certainly not for all devices
  */
-#define NI_PFI(x)       (NI_NAMES_BASE        + ((x) & 0x3f))
+#define NI_PFI(x)               _TERM_N(NI_NAMES_BASE, 64, x)
 /* 8 trigger lines by standard, Some devices cannot talk to all eight. */
-#define TRIGGER_LINE(x) (NI_PFI(-1)       + 1 + ((x) & 0x7))
+#define TRIGGER_LINE(x)         _TERM_N(NI_PFI(-1) + 1, 8, x)
 /* 4 RTSI shared MUXes to route signals to/from TRIGGER_LINES on NI hardware */
-#define NI_RTSI_BRD(x)  (TRIGGER_LINE(-1) + 1 + ((x) & 0x3))
+#define NI_RTSI_BRD(x)          _TERM_N(TRIGGER_LINE(-1) + 1, 4, x)
 
 /* *** Counter/timer names : 8 counters max *** */
-#define NI_COUNTER_NAMES_BASE  (NI_RTSI_BRD(-1)  + 1)
-#define NI_MAX_COUNTERS        7
-#define NI_CtrSource(x)        (NI_COUNTER_NAMES_BASE + ((x) & NI_MAX_COUNTERS))
+#define NI_MAX_COUNTERS         8
+#define NI_COUNTER_NAMES_BASE   (NI_RTSI_BRD(-1)  + 1)
+#define NI_CtrSource(x)       _TERM_N(NI_COUNTER_NAMES_BASE, NI_MAX_COUNTERS, x)
 /* Gate, Aux, A,B,Z are all treated, at times as gates */
-#define NI_GATES_NAMES_BASE    (NI_CtrSource(-1) + 1)
-#define NI_CtrGate(x)          (NI_GATES_NAMES_BASE   + ((x) & NI_MAX_COUNTERS))
-#define NI_CtrAux(x)           (NI_CtrGate(-1)   + 1  + ((x) & NI_MAX_COUNTERS))
-#define NI_CtrA(x)             (NI_CtrAux(-1)    + 1  + ((x) & NI_MAX_COUNTERS))
-#define NI_CtrB(x)             (NI_CtrA(-1)      + 1  + ((x) & NI_MAX_COUNTERS))
-#define NI_CtrZ(x)             (NI_CtrB(-1)      + 1  + ((x) & NI_MAX_COUNTERS))
-#define NI_GATES_NAMES_MAX     NI_CtrZ(-1)
-#define NI_CtrArmStartTrigger(x) (NI_CtrZ(-1)    + 1  + ((x) & NI_MAX_COUNTERS))
+#define NI_GATES_NAMES_BASE     (NI_CtrSource(-1) + 1)
+#define NI_CtrGate(x)           _TERM_N(NI_GATES_NAMES_BASE, NI_MAX_COUNTERS, x)
+#define NI_CtrAux(x)            _TERM_N(NI_CtrGate(-1)  + 1, NI_MAX_COUNTERS, x)
+#define NI_CtrA(x)              _TERM_N(NI_CtrAux(-1)   + 1, NI_MAX_COUNTERS, x)
+#define NI_CtrB(x)              _TERM_N(NI_CtrA(-1)     + 1, NI_MAX_COUNTERS, x)
+#define NI_CtrZ(x)              _TERM_N(NI_CtrB(-1)     + 1, NI_MAX_COUNTERS, x)
+#define NI_GATES_NAMES_MAX      NI_CtrZ(-1)
+#define NI_CtrArmStartTrigger(x) _TERM_N(NI_CtrZ(-1)    + 1, NI_MAX_COUNTERS, x)
 #define NI_CtrInternalOutput(x) \
-                     (NI_CtrArmStartTrigger(-1)  + 1  + ((x) & NI_MAX_COUNTERS))
+                      _TERM_N(NI_CtrArmStartTrigger(-1) + 1, NI_MAX_COUNTERS, x)
 /** external pin(s) labeled conveniently as Ctr<i>Out. */
-#define NI_CtrOut(x)  (NI_CtrInternalOutput(-1)  + 1  + ((x) & NI_MAX_COUNTERS))
+#define NI_CtrOut(x)   _TERM_N(NI_CtrInternalOutput(-1) + 1, NI_MAX_COUNTERS, x)
 /** For Buffered sampling of ctr -- x series capability. */
-#define NI_CtrSampleClock(x)    (NI_CtrOut(-1)   + 1  + ((x) & NI_MAX_COUNTERS))
-#define NI_COUNTER_NAMES_MAX   NI_CtrSampleClock(-1)
+#define NI_CtrSampleClock(x)    _TERM_N(NI_CtrOut(-1)   + 1, NI_MAX_COUNTERS, x)
+#define NI_COUNTER_NAMES_MAX    NI_CtrSampleClock(-1)
 
 enum ni_common_signal_names {
         /* PXI_Star: this is a non-NI-specific signal */
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index 2d1e0325d04d..5edf59ac6706 100644
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -2843,7 +2843,8 @@ static int ni_ao_insn_config(struct comedi_device *dev,
                 return ni_ao_arm(dev, s);
         case INSN_CONFIG_GET_CMD_TIMING_CONSTRAINTS:
                 /* we don't care about actual channels */
-                data[1] = board->ao_speed;
+                /* data[3] : chanlist_len */
+                data[1] = board->ao_speed * data[3];
                 data[2] = 0;
                 return 0;
         default:
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c b/drivers/staging/media/sunxi/cedrus/cedrus.c
index dd121f66fa2d..c912c70b3ef7 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus.c
@@ -108,17 +108,6 @@ static int cedrus_request_validate(struct media_request *req)
         unsigned int count;
         unsigned int i;
 
-        count = vb2_request_buffer_cnt(req);
-        if (!count) {
-                v4l2_info(&ctx->dev->v4l2_dev,
-                          "No buffer was provided with the request\n");
-                return -ENOENT;
-        } else if (count > 1) {
-                v4l2_info(&ctx->dev->v4l2_dev,
-                          "More than one buffer was provided with the request\n");
-                return -EINVAL;
-        }
-
         list_for_each_entry(obj, &req->objects, list) {
                 struct vb2_buffer *vb;
 
@@ -133,6 +122,17 @@ static int cedrus_request_validate(struct media_request *req)
         if (!ctx)
                 return -ENOENT;
 
+        count = vb2_request_buffer_cnt(req);
+        if (!count) {
+                v4l2_info(&ctx->dev->v4l2_dev,
+                          "No buffer was provided with the request\n");
+                return -ENOENT;
+        } else if (count > 1) {
+                v4l2_info(&ctx->dev->v4l2_dev,
+                          "More than one buffer was provided with the request\n");
+                return -EINVAL;
+        }
+
         parent_hdl = &ctx->hdl;
 
         hdl = v4l2_ctrl_request_hdl_find(req, parent_hdl);
diff --git a/drivers/staging/most/core.c b/drivers/staging/most/core.c
index 6a18cf73c85e..18936cdb1083 100644
--- a/drivers/staging/most/core.c
+++ b/drivers/staging/most/core.c
@@ -351,7 +351,7 @@ static ssize_t set_datatype_show(struct device *dev,
 
         for (i = 0; i < ARRAY_SIZE(ch_data_type); i++) {
                 if (c->cfg.data_type & ch_data_type[i].most_ch_data_type)
-                        return snprintf(buf, PAGE_SIZE, ch_data_type[i].name);
+                        return snprintf(buf, PAGE_SIZE, "%s", ch_data_type[i].name);
         }
         return snprintf(buf, PAGE_SIZE, "unconfigured\n");
 }
diff --git a/drivers/staging/mt7621-dma/mtk-hsdma.c b/drivers/staging/mt7621-dma/mtk-hsdma.c
index df6ebf41bdea..5831f816c17b 100644
--- a/drivers/staging/mt7621-dma/mtk-hsdma.c
+++ b/drivers/staging/mt7621-dma/mtk-hsdma.c
@@ -335,6 +335,8 @@ static int mtk_hsdma_start_transfer(struct mtk_hsdam_engine *hsdma,
         /* tx desc */
         src = sg->src_addr;
         for (i = 0; i < chan->desc->num_sgs; i++) {
+                tx_desc = &chan->tx_ring[chan->tx_idx];
+
                 if (len > HSDMA_MAX_PLEN)
                         tlen = HSDMA_MAX_PLEN;
                 else
@@ -344,7 +346,6 @@ static int mtk_hsdma_start_transfer(struct mtk_hsdam_engine *hsdma,
                         tx_desc->addr1 = src;
                         tx_desc->flags |= HSDMA_DESC_PLEN1(tlen);
                 } else {
-                        tx_desc = &chan->tx_ring[chan->tx_idx];
                         tx_desc->addr0 = src;
                         tx_desc->flags = HSDMA_DESC_PLEN0(tlen);
 
diff --git a/drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c b/drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c
index b8566ed898f1..aa98fbb17013 100644
--- a/drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c
+++ b/drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c
@@ -82,7 +82,7 @@ static int rt2880_pinctrl_dt_node_to_map(struct pinctrl_dev *pctrldev,
         struct property *prop;
         const char *function_name, *group_name;
         int ret;
-        int ngroups;
+        int ngroups = 0;
         unsigned int reserved_maps = 0;
 
         for_each_node_with_property(np_config, "group")
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c b/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c
index 85077947b9b8..85aba8a503cd 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c
@@ -109,12 +109,12 @@ static void update_recvframe_phyinfo(union recv_frame *precvframe,
         rx_bssid = get_hdr_bssid(wlanhdr);
         pkt_info.bssid_match = ((!IsFrameTypeCtrl(wlanhdr)) &&
                                 !pattrib->icv_err && !pattrib->crc_err &&
-                                !ether_addr_equal(rx_bssid, my_bssid));
+                                ether_addr_equal(rx_bssid, my_bssid));
 
         rx_ra = get_ra(wlanhdr);
         my_hwaddr = myid(&padapter->eeprompriv);
         pkt_info.to_self = pkt_info.bssid_match &&
-                !ether_addr_equal(rx_ra, my_hwaddr);
+                ether_addr_equal(rx_ra, my_hwaddr);
 
 
         pkt_info.is_beacon = pkt_info.bssid_match &&
diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index af2234798fa8..db553f2e4c0b 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -1277,7 +1277,7 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy,
 
                 sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_PACKETS);
                 sinfo->tx_packets = psta->sta_stats.tx_pkts;
-
+                sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_FAILED);
         }
 
         /* for Ad-Hoc/AP mode */
diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
index 28bfdbdc6e76..b8631baf128d 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
@@ -2289,7 +2289,7 @@ static int rtw_wx_read32(struct net_device *dev,
 exit:
         kfree(ptmp);
 
-        return 0;
+        return ret;
 }
 
 static int rtw_wx_write32(struct net_device *dev,
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index ea789376de0f..45de21c210c1 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -1795,6 +1795,7 @@ vchiq_compat_ioctl_await_completion(struct file *file,
         struct vchiq_await_completion32 args32;
         struct vchiq_completion_data32 completion32;
         unsigned int *msgbufcount32;
+        unsigned int msgbufcount_native;
         compat_uptr_t msgbuf32;
         void *msgbuf;
         void **msgbufptr;
@@ -1906,7 +1907,11 @@ vchiq_compat_ioctl_await_completion(struct file *file,
                          sizeof(completion32)))
                 return -EFAULT;
 
-        args32.msgbufcount--;
+        if (get_user(msgbufcount_native, &args->msgbufcount))
+                return -EFAULT;
+
+        if (!msgbufcount_native)
+                args32.msgbufcount--;
 
         msgbufcount32 =
                 &((struct vchiq_await_completion32 __user *)arg)->msgbufcount;
diff --git a/include/linux/hid-sensor-hub.h b/include/linux/hid-sensor-hub.h
index 331dc377c275..dc12f5c4b076 100644
--- a/include/linux/hid-sensor-hub.h
+++ b/include/linux/hid-sensor-hub.h
@@ -177,6 +177,7 @@ int sensor_hub_input_get_attribute_info(struct hid_sensor_hub_device *hsdev,
 * @attr_usage_id:       Attribute usage id as per spec
 * @report_id:   Report id to look for
 * @flag:      Synchronous or asynchronous read
+* @is_signed:   If true then fields < 32 bits will be sign-extended
 *
 * Issues a synchronous or asynchronous read request for an input attribute.
 * Returns data upto 32 bits.
@@ -190,7 +191,8 @@ enum sensor_hub_read_flags {
 int sensor_hub_input_attr_get_raw_value(struct hid_sensor_hub_device *hsdev,
                                         u32 usage_id,
                                         u32 attr_usage_id, u32 report_id,
-                                        enum sensor_hub_read_flags flag
+                                        enum sensor_hub_read_flags flag,
+                                        bool is_signed
 );
 
 /**