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

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

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



Pull staging fixes from Greg Kroah-Hartman:
 "Here are a number of small fixes to staging drivers for your 3.8-rc3
  tree.

  Well, the omapdrm fixes aren't really "small" but they were waiting on
  a number of other drm patches to go in through the drm tree, and got
  delayed by my vacation over the holidays.  They are totally
  self-contained, everyone involved have acked them, and they fix issues
  that people have been having with the driver.

  Other than that one, it's a bunch of tiny bugfixes for a number of
  reported issues.

  Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">

* tag 'staging-3.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (36 commits)
  staging: zram: fix invalid memory references during disk write
  staging: tidspbridge: use prepare/unprepare on dsp clocks
  staging: tidspbridge: Fix build breakage due to splitting CM functions.
  staging: comedi: comedi_test: fix race when cancelling command
  staging: comedi: Kconfig: COMEDI_NI_AT_A2150 should select COMEDI_FC
  staging: comedi: prevent auto-unconfig of manually configured devices
  staging: comedi: fix minimum AO period for NI 625x and NI 628x
  staging: vme_pio2: fix oops on module unloading
  staging: speakup: avoid out-of-range access in synth_add()
  staging: speakup: avoid out-of-range access in synth_init()
  staging: rtl8192e: Fix failure to check pci_map_single()
  staging: rtl8187se: Fix failure to check pci_map_single()
  staging: drm/imx: fix double free bug in error path
  staging: drm/imx: several bug fixes
  staging: drm/imx: check return value of ipu_reset()
  staging: drm/omap: fix flags in dma buf exporting
  staging: drm/omap: use omapdss low level API
  staging/fwserial: Update TODO file per reviewer comments
  staging/fwserial: Limit tx/rx to 1394-2008 spec maximum
  staging/fwserial: Refine Kconfig help text
  ...
parents 46fed0a5 397c6066

drivers/iio/accel/Kconfig

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

	select IIO_BUFFER

	select IIO_TRIGGERED_BUFFER

	select IIO_TRIGGERED_BUFFER

	select HID_SENSOR_IIO_COMMON

	select HID_SENSOR_IIO_COMMON

	select HID_SENSOR_IIO_TRIGGER

	tristate "HID Accelerometers 3D"

	tristate "HID Accelerometers 3D"

	help

	help

	  Say yes here to build support for the HID SENSOR

	  Say yes here to build support for the HID SENSOR

drivers/iio/adc/ad7266.c

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

		if (ret)

			goto error_put_reg;

			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 {

	} else {

		/* Use internal reference */

		/* Use internal reference */

		st->vref_uv = 2500000;

		st->vref_uv = 2500000;

drivers/iio/adc/at91_adc.c

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

		*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);

	iio_trigger_notify_done(idev->trig);

drivers/iio/adc/max1363.c

+6 −7
Original line number Original line Diff line number Diff line
@@ -1605,6 +1605,7 @@ static int max1363_probe(struct i2c_client *client, 




	return 0;

	return 0;

error_free_irq:

error_free_irq:

	if (client->irq)

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

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

error_uninit_buffer:

error_uninit_buffer:

	iio_buffer_unregister(indio_dev);

	iio_buffer_unregister(indio_dev);
@@ -1612,12 +1613,12 @@ error_cleanup_buffer: 
	max1363_buffer_cleanup(indio_dev);

	max1363_buffer_cleanup(indio_dev);

error_free_available_scan_masks:

error_free_available_scan_masks:

	kfree(indio_dev->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:

error_disable_reg:

	regulator_disable(st->reg);

	regulator_disable(st->reg);

error_put_reg:

error_put_reg:

	regulator_put(st->reg);

	regulator_put(st->reg);

error_unregister_map:

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

error_free_device:

error_free_device:

	iio_device_free(indio_dev);

	iio_device_free(indio_dev);

error_out:

error_out:
@@ -1635,10 +1636,8 @@ static int max1363_remove(struct i2c_client *client) 
	iio_buffer_unregister(indio_dev);

	iio_buffer_unregister(indio_dev);

	max1363_buffer_cleanup(indio_dev);

	max1363_buffer_cleanup(indio_dev);

	kfree(indio_dev->available_scan_masks);

	kfree(indio_dev->available_scan_masks);

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

	regulator_disable(st->reg);

	regulator_disable(st->reg);

	regulator_put(st->reg);

	regulator_put(st->reg);

	}

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

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

	iio_device_free(indio_dev);

	iio_device_free(indio_dev);

drivers/iio/common/hid-sensors/Kconfig

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

config HID_SENSOR_IIO_COMMON

	tristate "Common modules for all HID Sensor IIO drivers"

	tristate "Common modules for all HID Sensor IIO drivers"

	depends on HID_SENSOR_HUB

	depends on HID_SENSOR_HUB

	select IIO_TRIGGER if IIO_BUFFER

	select HID_SENSOR_IIO_TRIGGER if IIO_BUFFER

	help

	help

	  Say yes here to build support for HID sensor to use

	  Say yes here to build support for HID sensor to use

	  HID sensor common processing for attributes and IIO triggers.

	  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

	  HID sensor drivers, this module contains processing for those

	  attributes.

	  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

config HID_SENSOR_ENUM_BASE_QUIRKS

	bool "ENUM base quirks for HID Sensor IIO drivers"

	bool "ENUM base quirks for HID Sensor IIO drivers"

	depends on HID_SENSOR_IIO_COMMON

	depends on HID_SENSOR_IIO_COMMON