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

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

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

Pull staging driver fixes from Greg KH:
 "Here are a few fixes for staging and iio drivers that resolve issues
  reported in 3.16-rc1.

  All have been in linux-next just fine"

* tag 'staging-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  imx-drm: parallel-display: Fix DPMS default state.
  staging: android: timed_output: fix use after free of dev
  staging: comedi: addi_apci_1564: add addi_watchdog dependency
  staging: rtl8723au: Reference correct firmwarefiles with MODULE_FIRMWARE()
  staging: rtl8723au: Request correct firmware file for A-cut parts
  iio: adc: checking for NULL instead of IS_ERR() in probe
  iio: adc: at91: signedness bug in at91_adc_get_trigger_value_by_name()
  iio: mxs-lradc: fix divider
  iio: Fix endianness issue in ak8975_read_axis()
  staging/iio: IIO_SIMPLE_DUMMY_BUFFER neds IIO_BUFFER
  twl4030-madc: Request processed values in twl4030_get_madc_conversion
  staging: iio: tsl2x7x_core: fix proximity treshold
  iio: Fix two mpl3115 issues in measurement conversion
  iio: hid-sensors: Get feature report from sensor hub after changing power state
parents c3cb500e c026a3f3

drivers/iio/adc/at91_adc.c

+8 −8
Original line number Diff line number Diff line
@@ -510,12 +510,11 @@ static int at91_adc_channel_init(struct iio_dev *idev) 
	return idev->num_channels;

}



static u8 at91_adc_get_trigger_value_by_name(struct iio_dev *idev,

static int at91_adc_get_trigger_value_by_name(struct iio_dev *idev,

					     struct at91_adc_trigger *triggers,

					     const char *trigger_name)

{

	struct at91_adc_state *st = iio_priv(idev);

	u8 value = 0;

	int i;



	for (i = 0; i < st->trigger_number; i++) {
@@ -528,15 +527,16 @@ static u8 at91_adc_get_trigger_value_by_name(struct iio_dev *idev, 
			return -ENOMEM;



		if (strcmp(trigger_name, name) == 0) {

			value = triggers[i].value;

			kfree(name);

			break;

			if (triggers[i].value == 0)

				return -EINVAL;

			return triggers[i].value;

		}



		kfree(name);

	}



	return value;

	return -EINVAL;

}



static int at91_adc_configure_trigger(struct iio_trigger *trig, bool state)
@@ -546,14 +546,14 @@ static int at91_adc_configure_trigger(struct iio_trigger *trig, bool state) 
	struct iio_buffer *buffer = idev->buffer;

	struct at91_adc_reg_desc *reg = st->registers;

	u32 status = at91_adc_readl(st, reg->trigger_register);

	u8 value;

	int value;

	u8 bit;



	value = at91_adc_get_trigger_value_by_name(idev,

						   st->trigger_list,

						   idev->trig->name);

	if (value == 0)

		return -EINVAL;

	if (value < 0)

		return value;



	if (state) {

		st->buffer = kmalloc(idev->scan_bytes, GFP_KERNEL);

drivers/iio/adc/men_z188_adc.c

+2 −2
Original line number Diff line number Diff line
@@ -121,8 +121,8 @@ static int men_z188_probe(struct mcb_device *dev, 
	indio_dev->num_channels = ARRAY_SIZE(z188_adc_iio_channels);



	mem = mcb_request_mem(dev, "z188-adc");

	if (!mem)

		return -ENOMEM;

	if (IS_ERR(mem))

		return PTR_ERR(mem);



	adc->base = ioremap(mem->start, resource_size(mem));

	if (adc->base == NULL)

drivers/iio/adc/twl4030-madc.c

+1 −0
Original line number Diff line number Diff line
@@ -645,6 +645,7 @@ int twl4030_get_madc_conversion(int channel_no) 
	req.channels = (1 << channel_no);

	req.method = TWL4030_MADC_SW2;

	req.active = 0;

	req.raw = 0;

	req.func_cb = NULL;

	ret = twl4030_madc_conversion(&req);

	if (ret < 0)

drivers/iio/common/hid-sensors/hid-sensor-trigger.c

+3 −0
Original line number Diff line number Diff line
@@ -75,6 +75,9 @@ int hid_sensor_power_state(struct hid_sensor_common *st, bool state) 
					(s32)report_val);

	}



	sensor_hub_get_feature(st->hsdev, st->power_state.report_id,

					st->power_state.index,

					&state_val);

	return 0;

}

EXPORT_SYMBOL(hid_sensor_power_state);

drivers/iio/magnetometer/ak8975.c

+1 −8
Original line number Diff line number Diff line
@@ -373,8 +373,6 @@ static int ak8975_read_axis(struct iio_dev *indio_dev, int index, int *val) 
{

	struct ak8975_data *data = iio_priv(indio_dev);

	struct i2c_client *client = data->client;

	u16 meas_reg;

	s16 raw;

	int ret;



	mutex_lock(&data->lock);
@@ -422,16 +420,11 @@ static int ak8975_read_axis(struct iio_dev *indio_dev, int index, int *val) 
		dev_err(&client->dev, "Read axis data fails\n");

		goto exit;

	}

	meas_reg = ret;



	mutex_unlock(&data->lock);



	/* Endian conversion of the measured values. */

	raw = (s16) (le16_to_cpu(meas_reg));



	/* Clamp to valid range. */

	raw = clamp_t(s16, raw, -4096, 4095);

	*val = raw;

	*val = clamp_t(s16, ret, -4096, 4095);

	return IIO_VAL_INT;



exit: