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

Commit 1676587b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'fixes-for-3.13a' of... 

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

Jonathan writes:

First round of fixes for IIO in the 3.13 cycle.

The usual mixed bag of fixes.

* 3 cases where kconfig dependencies were missing.  We need to keep a closer
  eye on this in new drivers.

* hid_sensors was abusing the iio_dev->trigger pointer.  We had a round
  of clearing this out some time ago but this driver clearly slipped through.

* A misuse of the IIO_ST macro, in mcp3422, which we should really make a
  concertive effort to finish removing.

* Avoid a double free introduced by recent buffer reference counting in the
  one driver that (quite reasonably!) does things differently (am335x)

* A missing mutex_unlock in kxsd9 that means that driver has been non
  functional for some time and no one noticed (including me who for once
  actually has one of the supported devices).

* An incorrect assumption about the parameters of sign_extend32 in mcp3422.

So nothing controversial.  The only substantial patch is the hid_sensors
one and that is actually just adding a new pointer to the devices private
state then moving the code over to it.
parents 5fa9576a 0ee005c7

drivers/iio/accel/hid-sensor-accel-3d.c

+3 −2
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ static int hid_accel_3d_probe(struct platform_device *pdev) 
error_iio_unreg:

	iio_device_unregister(indio_dev);

error_remove_trigger:

	hid_sensor_remove_trigger(indio_dev);

	hid_sensor_remove_trigger(&accel_state->common_attributes);

error_unreg_buffer_funcs:

	iio_triggered_buffer_cleanup(indio_dev);

error_free_dev_mem:
@@ -363,10 +363,11 @@ static int hid_accel_3d_remove(struct platform_device *pdev) 
{

	struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;

	struct iio_dev *indio_dev = platform_get_drvdata(pdev);

	struct accel_3d_state *accel_state = iio_priv(indio_dev);



	sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_ACCEL_3D);

	iio_device_unregister(indio_dev);

	hid_sensor_remove_trigger(indio_dev);

	hid_sensor_remove_trigger(&accel_state->common_attributes);

	iio_triggered_buffer_cleanup(indio_dev);

	kfree(indio_dev->channels);

drivers/iio/accel/kxsd9.c

+4 −3
Original line number Diff line number Diff line
@@ -112,9 +112,10 @@ static int kxsd9_read(struct iio_dev *indio_dev, u8 address) 
	mutex_lock(&st->buf_lock);

	st->tx[0] = KXSD9_READ(address);

	ret = spi_sync_transfer(st->us, xfers, ARRAY_SIZE(xfers));

	if (ret)

	if (!ret)

		ret = (((u16)(st->rx[0])) << 8) | (st->rx[1] & 0xF0);

	mutex_unlock(&st->buf_lock);

	return ret;

	return (((u16)(st->rx[0])) << 8) | (st->rx[1] & 0xF0);

}



static IIO_CONST_ATTR(accel_scale_available,

drivers/iio/adc/at91_adc.c

+1 −0
Original line number Diff line number Diff line
@@ -1047,6 +1047,7 @@ static int at91_adc_probe(struct platform_device *pdev) 
	} else {

		if (!st->caps->has_tsmr) {

			dev_err(&pdev->dev, "We don't support non-TSMR adc\n");

			ret = -ENODEV;

			goto error_disable_adc_clk;

		}

drivers/iio/adc/mcp3422.c

+4 −4
Original line number Diff line number Diff line
@@ -88,10 +88,10 @@ static const int mcp3422_sample_rates[4] = { 


/* sample rates to sign extension table */

static const int mcp3422_sign_extend[4] = {

	[MCP3422_SRATE_240] = 12,

	[MCP3422_SRATE_60] = 14,

	[MCP3422_SRATE_15] = 16,

	[MCP3422_SRATE_3] = 18 };

	[MCP3422_SRATE_240] = 11,

	[MCP3422_SRATE_60] = 13,

	[MCP3422_SRATE_15] = 15,

	[MCP3422_SRATE_3] = 17 };



/* Client data (each client gets its own) */

struct mcp3422 {

drivers/iio/adc/ti_am335x_adc.c

+5 −2
Original line number Diff line number Diff line
@@ -229,12 +229,15 @@ static int tiadc_iio_buffered_hardware_setup(struct iio_dev *indio_dev, 
	unsigned long flags,

	const struct iio_buffer_setup_ops *setup_ops)

{

	struct iio_buffer *buffer;

	int ret;



	indio_dev->buffer = iio_kfifo_allocate(indio_dev);

	if (!indio_dev->buffer)

	buffer = iio_kfifo_allocate(indio_dev);

	if (!buffer)

		return -ENOMEM;



	iio_device_attach_buffer(indio_dev, buffer);



	ret = request_threaded_irq(irq,	pollfunc_th, pollfunc_bh,

				flags, indio_dev->name, indio_dev);

	if (ret)