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

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

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

Pull staging tree fixes from Greg KH:
 "Here are a few iio driver fixes for 3.11-rc2.  They are still spread
  across drivers/iio and drivers/staging/iio so they are coming in
  through this tree.

  I've also removed the drivers/staging/csr/ driver as the developers
  who originally sent it to me have moved on to other companies, and CSR
  still will not send us the specs for the device, making the driver
  pretty much obsolete and impossible to fix up.  Deleting it now
  prevents people from sending in lots of tiny codingsyle fixes that
  will never go anywhere.

  It also helps to offset the large lustre filesystem merge that
  happened in 3.11-rc1 in the overall 3.11.0 diffstat.  :)"

* tag 'staging-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: csr: remove driver
  iio: lps331ap: Fix wrong in_pressure_scale output value
  iio staging: fix lis3l02dq, read error handling
  staging:iio:ad7291: add missing .driver_module to struct iio_info
  iio: ti_am335x_adc: add missing .driver_module to struct iio_info
  iio: mxs-lradc: Remove useless check in read_raw
  iio: mxs-lradc: Fix misuse of iio->trig
  iio: inkern: fix iio_convert_raw_to_processed_unlocked
  iio: Fix iio_channel_has_info
  iio:trigger: device_unregister->device_del to avoid double free
  iio: dac: ad7303: fix error return code in ad7303_probe()
parents 36231d25 78077256

drivers/iio/adc/ti_am335x_adc.c

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ static int tiadc_read_raw(struct iio_dev *indio_dev, 


static const struct iio_info tiadc_info = {

	.read_raw = &tiadc_read_raw,

	.driver_module = THIS_MODULE,

};



static int tiadc_probe(struct platform_device *pdev)

drivers/iio/dac/ad7303.c

+3 −1
Original line number Diff line number Diff line
@@ -235,8 +235,10 @@ static int ad7303_probe(struct spi_device *spi) 


	if (ext_ref) {

		st->vref_reg = regulator_get(&spi->dev, "REF");

		if (IS_ERR(st->vref_reg))

		if (IS_ERR(st->vref_reg)) {

			ret = PTR_ERR(st->vref_reg);

			goto err_disable_vdd_reg;

		}



		ret = regulator_enable(st->vref_reg);

		if (ret)

drivers/iio/industrialio-trigger.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ void iio_trigger_unregister(struct iio_trigger *trig_info) 


	ida_simple_remove(&iio_trigger_ida, trig_info->id);

	/* Possible issue in here */

	device_unregister(&trig_info->dev);

	device_del(&trig_info->dev);

}

EXPORT_SYMBOL(iio_trigger_unregister);

drivers/iio/inkern.c

+1 −1
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ static int iio_convert_raw_to_processed_unlocked(struct iio_channel *chan, 
	int ret;



	ret = iio_channel_read(chan, &offset, NULL, IIO_CHAN_INFO_OFFSET);

	if (ret == 0)

	if (ret >= 0)

		raw64 += offset;



	scale_type = iio_channel_read(chan, &scale_val, &scale_val2,

drivers/iio/pressure/st_pressure_core.c

+4 −2
Original line number Diff line number Diff line
@@ -28,7 +28,9 @@ 
#include <linux/iio/common/st_sensors.h>

#include "st_pressure.h"



#define ST_PRESS_MBAR_TO_KPASCAL(x)		(x * 10)

#define ST_PRESS_LSB_PER_MBAR			4096UL

#define ST_PRESS_KPASCAL_NANO_SCALE		(100000000UL / \

						 ST_PRESS_LSB_PER_MBAR)

#define ST_PRESS_NUMBER_DATA_CHANNELS		1



/* DEFAULT VALUE FOR SENSORS */
@@ -51,8 +53,8 @@ 
#define ST_PRESS_1_FS_ADDR			0x23

#define ST_PRESS_1_FS_MASK			0x30

#define ST_PRESS_1_FS_AVL_1260_VAL		0x00

#define ST_PRESS_1_FS_AVL_1260_GAIN		ST_PRESS_MBAR_TO_KPASCAL(244141)

#define ST_PRESS_1_FS_AVL_TEMP_GAIN		2083000

#define ST_PRESS_1_FS_AVL_1260_GAIN		ST_PRESS_KPASCAL_NANO_SCALE

#define ST_PRESS_1_BDU_ADDR			0x20

#define ST_PRESS_1_BDU_MASK			0x04

#define ST_PRESS_1_DRDY_IRQ_ADDR		0x22