Commit 48436e82 authored Feb 01, 2016 by Greg Kroah-Hartman

Merge tag 'iio-fixes-for-4.5a' of...

Merge tag 'iio-fixes-for-4.5a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus

Jonathan writes:

First set of IIO fixes for the 4.5 cycle.

This set comprises those not dependent on patches in the 4.5 merge cycle.
A second set will follow shortly with ones that are.

* core in kernel interfaces
  - fix a possible NULL dereference that is a theoretical possibility
    via odd usage of iio_channel_release. Pretty much a hardening of
    the interface, but observed in the wild with the twl4030_charger
    driver.
* acpi-als
  - report the data as processed as it is in lux.  This fixes a wrong
    use of the IIO ABI.  However, old _raw version retained to avoid
    breaking any userspace in the wild that is relying on that (none
    known but it doesn't hurt us much to retain it)
* ade7753
  - fix some error handling to avoid use of unitialized data.
* ltr501
  - use a signed return type for ltr501_match_samp_freq so as to allow
    returning of an error code.
* mcp4725
  - set name field of struct iio_dev to ensure the sysfs name attribute
    doesn't give NULL.
* mpl115
  - temperature offset sign is wrong.
* stk8ba50
  - IIO_TRIGGER dependency added
* ti_am335x_adc
  - Label buffer as a software buffer. It's actually a hybrid of a
    true hardware buffer feeding a kfifo, but the meaning of these fields
    has changed a little recently and in this case it should be labeled
    a software buffer ensure it is allowed to use the kfifo.
* vf610_adc
  - HAS_IOMEM dependency

parents 8d9b39c6 7e1da863

drivers/iio/accel/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -213,6 +213,7 @@ config STK8312
		config STK8BA50
		tristate "Sensortek STK8BA50 3-Axis Accelerometer Driver"
		depends on I2C
		depends on IIO_TRIGGER
		help
		Say yes here to get support for the Sensortek STK8BA50 3-axis
		accelerometer.

drivers/iio/adc/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -409,6 +409,7 @@ config TWL6030_GPADC
		config VF610_ADC
		tristate "Freescale vf610 ADC driver"
		depends on OF
		depends on HAS_IOMEM
		select IIO_BUFFER
		select IIO_TRIGGERED_BUFFER
		help

drivers/iio/adc/ti_am335x_adc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -289,7 +289,7 @@ static int tiadc_iio_buffered_hardware_setup(struct iio_dev *indio_dev,
		goto error_kfifo_free;

		indio_dev->setup_ops = setup_ops;
		indio_dev->modes \|= INDIO_BUFFER_HARDWARE;
		indio_dev->modes \|= INDIO_BUFFER_SOFTWARE;

		return 0;

drivers/iio/dac/mcp4725.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -300,6 +300,7 @@ static int mcp4725_probe(struct i2c_client *client,
		data->client = client;

		indio_dev->dev.parent = &client->dev;
		indio_dev->name = id->name;
		indio_dev->info = &mcp4725_info;
		indio_dev->channels = &mcp4725_channel;
		indio_dev->num_channels = 1;

drivers/iio/inkern.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -349,6 +349,8 @@ EXPORT_SYMBOL_GPL(iio_channel_get);

		void iio_channel_release(struct iio_channel *channel)
		{
		if (!channel)
		return;
		iio_device_put(channel->indio_dev);
		kfree(channel);
		}

Admin message