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

Commit 17cb3be6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'staging-linus' into staging-next 



This is to get the comedi fixes, and resolve the issue in comdi_test.c
and comedi_fops.c that were caused by changes in both branches.

It also allows the fwserial driver changes to be applied, as they
required the fixes that are in staging-linus.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents d7f9729f e16a922a

drivers/iio/accel/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ config HID_SENSOR_ACCEL_3D 
	select IIO_BUFFER

	select IIO_TRIGGERED_BUFFER

	select HID_SENSOR_IIO_COMMON

	select HID_SENSOR_IIO_TRIGGER

	tristate "HID Accelerometers 3D"

	help

	  Say yes here to build support for the HID SENSOR

drivers/iio/adc/ad7266.c

+5 −1
Original line number Diff line number Diff line
@@ -411,7 +411,11 @@ static int __devinit ad7266_probe(struct spi_device *spi) 
		if (ret)

			goto error_put_reg;



		st->vref_uv = regulator_get_voltage(st->reg);

		ret = regulator_get_voltage(st->reg);

		if (ret < 0)

			goto error_disable_reg;



		st->vref_uv = ret;

	} else {

		/* Use internal reference */

		st->vref_uv = 2500000;

drivers/iio/adc/at91_adc.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static irqreturn_t at91_adc_trigger_handler(int irq, void *p) 
		*timestamp = pf->timestamp;

	}



	iio_push_to_buffers(indio_dev, (u8 *)st->buffer);

	iio_push_to_buffers(idev, (u8 *)st->buffer);



	iio_trigger_notify_done(idev->trig);

drivers/iio/adc/max1363.c

+6 −7
Original line number Diff line number Diff line
@@ -1558,17 +1558,18 @@ static int __devinit max1363_probe(struct i2c_client *client, 


	return 0;

error_free_irq:

	if (client->irq)

		free_irq(st->client->irq, indio_dev);

error_uninit_buffer:

	iio_triggered_buffer_cleanup(indio_dev);

error_free_available_scan_masks:

	kfree(indio_dev->available_scan_masks);

error_unregister_map:

	iio_map_array_unregister(indio_dev, client->dev.platform_data);

error_disable_reg:

	regulator_disable(st->reg);

error_put_reg:

	regulator_put(st->reg);

error_unregister_map:

	iio_map_array_unregister(indio_dev, client->dev.platform_data);

error_free_device:

	iio_device_free(indio_dev);

error_out:
@@ -1585,10 +1586,8 @@ static int __devexit max1363_remove(struct i2c_client *client) 
		free_irq(st->client->irq, indio_dev);

	iio_triggered_buffer_cleanup(indio_dev);

	kfree(indio_dev->available_scan_masks);

	if (!IS_ERR(st->reg)) {

	regulator_disable(st->reg);

	regulator_put(st->reg);

	}

	iio_map_array_unregister(indio_dev, client->dev.platform_data);

	iio_device_free(indio_dev);

drivers/iio/common/hid-sensors/Kconfig

+12 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ menu "Hid Sensor IIO Common" 
config HID_SENSOR_IIO_COMMON

	tristate "Common modules for all HID Sensor IIO drivers"

	depends on HID_SENSOR_HUB

	select IIO_TRIGGER if IIO_BUFFER

	select HID_SENSOR_IIO_TRIGGER if IIO_BUFFER

	help

	  Say yes here to build support for HID sensor to use

	  HID sensor common processing for attributes and IIO triggers.
@@ -14,6 +14,17 @@ config HID_SENSOR_IIO_COMMON 
	  HID sensor drivers, this module contains processing for those

	  attributes.



config HID_SENSOR_IIO_TRIGGER

	tristate "Common module (trigger) for all HID Sensor IIO drivers"

	depends on HID_SENSOR_HUB && HID_SENSOR_IIO_COMMON

	select IIO_TRIGGER

	help

	  Say yes here to build trigger support for HID sensors.

	  Triggers will be send if all requested attributes were read.



	  If this driver is compiled as a module, it will be named

	  hid-sensor-trigger.



config HID_SENSOR_ENUM_BASE_QUIRKS

	bool "ENUM base quirks for HID Sensor IIO drivers"

	depends on HID_SENSOR_IIO_COMMON