Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Pull staging driver fixes from Greg KH:
 "Here are a few staging and IIO driver fixes for 4.4-rc5.

  All of them resolve reported problems and have been in linux-next for
  a while.  Nothing major here, just small fixes where needed"

* tag 'staging-4.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: lustre: echo_copy.._lsm() dereferences userland pointers directly
  iio: adc: spmi-vadc: add missing of_node_put
  iio: fix some warning messages
  iio: light: apds9960: correct ->last_busy count
  iio: lidar: return -EINVAL on invalid signal
  staging: iio: dummy: complete IIO events delivery to userspace
parents c474009c 9225c0b7

drivers/iio/adc/qcom-spmi-vadc.c

+3 −1
Original line number Diff line number Diff line
@@ -839,8 +839,10 @@ static int vadc_get_dt_data(struct vadc_priv *vadc, struct device_node *node) 


	for_each_available_child_of_node(node, child) {

		ret = vadc_get_dt_channel_data(vadc->dev, &prop, child);

		if (ret)

		if (ret) {

			of_node_put(child);

			return ret;

		}



		vadc->chan_props[index] = prop;

drivers/iio/industrialio-buffer.c

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ static int iio_scan_mask_set(struct iio_dev *indio_dev, 
	if (trialmask == NULL)

		return -ENOMEM;

	if (!indio_dev->masklength) {

		WARN_ON("Trying to set scanmask prior to registering buffer\n");

		WARN(1, "Trying to set scanmask prior to registering buffer\n");

		goto err_invalid_mask;

	}

	bitmap_copy(trialmask, buffer->scan_mask, indio_dev->masklength);

drivers/iio/industrialio-core.c

+1 −1
Original line number Diff line number Diff line
@@ -655,7 +655,7 @@ int __iio_device_attr_init(struct device_attribute *dev_attr, 
			break;

		case IIO_SEPARATE:

			if (!chan->indexed) {

				WARN_ON("Differential channels must be indexed\n");

				WARN(1, "Differential channels must be indexed\n");

				ret = -EINVAL;

				goto error_free_full_postfix;

			}

drivers/iio/light/apds9960.c

+1 −0
Original line number Diff line number Diff line
@@ -453,6 +453,7 @@ static int apds9960_set_power_state(struct apds9960_data *data, bool on) 
			usleep_range(data->als_adc_int_us,

				     APDS9960_MAX_INT_TIME_IN_US);

	} else {

		pm_runtime_mark_last_busy(dev);

		ret = pm_runtime_put_autosuspend(dev);

	}

drivers/iio/proximity/pulsedlight-lidar-lite-v2.c

+3 −3
Original line number Diff line number Diff line
@@ -130,10 +130,10 @@ static int lidar_get_measurement(struct lidar_data *data, u16 *reg) 
		if (ret < 0)

			break;



		/* return 0 since laser is likely pointed out of range */

		/* return -EINVAL since laser is likely pointed out of range */

		if (ret & LIDAR_REG_STATUS_INVALID) {

			*reg = 0;

			ret = 0;

			ret = -EINVAL;

			break;

		}
@@ -197,7 +197,7 @@ static irqreturn_t lidar_trigger_handler(int irq, void *private) 
	if (!ret) {

		iio_push_to_buffers_with_timestamp(indio_dev, data->buffer,

						   iio_get_time_ns());

	} else {

	} else if (ret != -EINVAL) {

		dev_err(&data->client->dev, "cannot read LIDAR measurement");

	}