Commit cd9a0433 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 40ebba2a c648284f

drivers/hid/hid-sensor-custom.c

+1 −1
Original line number Diff line number Diff line
@@ -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")))

drivers/hid/hid-sensor-hub.c

+10 −3
Original line number Diff line number Diff line
@@ -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,9 +332,15 @@ 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:

			if (is_signed)

				ret_val = *(s8 *)hsdev->pending.raw_data;

			else

				ret_val = *(u8 *)hsdev->pending.raw_data;

			break;

		case 2:

			if (is_signed)

				ret_val = *(s16 *)hsdev->pending.raw_data;

			else

				ret_val = *(u16 *)hsdev->pending.raw_data;

			break;

		case 4:

drivers/iio/accel/hid-sensor-accel-3d.c

+4 −1
Original line number Diff line number Diff line
@@ -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,

drivers/iio/gyro/hid-sensor-gyro-3d.c

+4 −1
Original line number Diff line number Diff line
@@ -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,

drivers/iio/humidity/hid-sensor-humidity.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE