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

Commit 3c2ea702 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging / IIO fixes from Greg KH:
 "Here are some IIO and Staging driver fixes for 3.17-rc6.  They are all
  pretty simple, and resolve reported issues"

* tag 'staging-3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: vt6655: buffer overflow in ioctl
  iio:magnetometer: bugfix magnetometers gain values
  iio: adc: at91: don't use the last converted data register
  iio: adc: xilinx-xadc: assign auxiliary channels address correctly
  iio: meter: ade7758: Fix indio_dev->trig assignment
  iio: inv_mpu6050: Fix indio_dev->trig assignment
  iio: gyro: itg3200: Fix indio_dev->trig assignment
  iio: st_sensors: Fix indio_dev->trig assignment
  iio: hid_sensor_hub: Fix indio_dev->trig assignment
  iio: adc: ad_sigma_delta: Fix indio_dev->trig assignment
  iio: accel: bma180: Fix indio_dev->trig assignment
  iio:trigger: modify return value for iio_trigger_get
  iio:inkern: fix overwritten -EPROBE_DEFER in of_iio_channel_get_by_name
parents c1fb79e2 ed87c2b2

drivers/iio/accel/bma180.c

+1 −1
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ static int bma180_probe(struct i2c_client *client, 
	trig->ops = &bma180_trigger_ops;

	iio_trigger_set_drvdata(trig, indio_dev);

	data->trig = trig;

	indio_dev->trig = trig;

	indio_dev->trig = iio_trigger_get(trig);



	ret = iio_trigger_register(trig);

	if (ret)

drivers/iio/adc/ad_sigma_delta.c

+1 −1
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ static int ad_sd_probe_trigger(struct iio_dev *indio_dev) 
		goto error_free_irq;



	/* select default trigger */

	indio_dev->trig = sigma_delta->trig;

	indio_dev->trig = iio_trigger_get(sigma_delta->trig);



	return 0;

drivers/iio/adc/at91_adc.c

+7 −5
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ struct at91_adc_state { 
	bool			done;

	int			irq;

	u16			last_value;

	int			chnb;

	struct mutex		lock;

	u8			num_channels;

	void __iomem		*reg_base;
@@ -274,7 +275,7 @@ void handle_adc_eoc_trigger(int irq, struct iio_dev *idev) 
		disable_irq_nosync(irq);

		iio_trigger_poll(idev->trig);

	} else {

		st->last_value = at91_adc_readl(st, AT91_ADC_LCDR);

		st->last_value = at91_adc_readl(st, AT91_ADC_CHAN(st, st->chnb));

		st->done = true;

		wake_up_interruptible(&st->wq_data_avail);

	}
@@ -351,7 +352,7 @@ static irqreturn_t at91_adc_rl_interrupt(int irq, void *private) 
	unsigned int reg;



	status &= at91_adc_readl(st, AT91_ADC_IMR);

	if (status & st->registers->drdy_mask)

	if (status & GENMASK(st->num_channels - 1, 0))

		handle_adc_eoc_trigger(irq, idev);



	if (status & AT91RL_ADC_IER_PEN) {
@@ -418,7 +419,7 @@ static irqreturn_t at91_adc_9x5_interrupt(int irq, void *private) 
		AT91_ADC_IER_YRDY |

		AT91_ADC_IER_PRDY;



	if (status & st->registers->drdy_mask)

	if (status & GENMASK(st->num_channels - 1, 0))

		handle_adc_eoc_trigger(irq, idev);



	if (status & AT91_ADC_IER_PEN) {
@@ -689,9 +690,10 @@ static int at91_adc_read_raw(struct iio_dev *idev, 
	case IIO_CHAN_INFO_RAW:

		mutex_lock(&st->lock);



		st->chnb = chan->channel;

		at91_adc_writel(st, AT91_ADC_CHER,

				AT91_ADC_CH(chan->channel));

		at91_adc_writel(st, AT91_ADC_IER, st->registers->drdy_mask);

		at91_adc_writel(st, AT91_ADC_IER, BIT(chan->channel));

		at91_adc_writel(st, AT91_ADC_CR, AT91_ADC_START);



		ret = wait_event_interruptible_timeout(st->wq_data_avail,
@@ -708,7 +710,7 @@ static int at91_adc_read_raw(struct iio_dev *idev, 


		at91_adc_writel(st, AT91_ADC_CHDR,

				AT91_ADC_CH(chan->channel));

		at91_adc_writel(st, AT91_ADC_IDR, st->registers->drdy_mask);

		at91_adc_writel(st, AT91_ADC_IDR, BIT(chan->channel));



		st->last_value = 0;

		st->done = false;

drivers/iio/adc/xilinx-xadc-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1126,7 +1126,7 @@ static int xadc_parse_dt(struct iio_dev *indio_dev, struct device_node *np, 
				chan->address = XADC_REG_VPVN;

			} else {

				chan->scan_index = 15 + reg;

				chan->scan_index = XADC_REG_VAUX(reg - 1);

				chan->address = XADC_REG_VAUX(reg - 1);

			}

			num_channels++;

			chan++;

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

+2 −1
Original line number Diff line number Diff line
@@ -122,7 +122,8 @@ int hid_sensor_setup_trigger(struct iio_dev *indio_dev, const char *name, 
		dev_err(&indio_dev->dev, "Trigger Register Failed\n");

		goto error_free_trig;

	}

	indio_dev->trig = attrb->trigger = trig;

	attrb->trigger = trig;

	indio_dev->trig = iio_trigger_get(trig);



	return ret;