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

Commit 388c2896 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging driver fixes from Greg Kroah-Hartman:
 "Here are some staging tree driver fixes for 3.10-rc2

  The drivers/iio/ changes are here as they are still tied into
  drivers/staging/iio/.

  Nothing major, just a number of small bugfixes, and a larger
  documentation update for the ramster code."

* tag 'staging-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (28 commits)
  staging: dwc2: remove compile warning for USB_DWC2_TRACK_MISSED_SOFS
  iio: exynos_adc: fix wrong structure extration in suspend and resume
  iio:common:st: added disable function after read info raw data
  iio: dac: Fix build error when CONFIG_SPI_MASTER=y && CONFIG_I2C=m
  staging:iio:light:tsl2x7x: fix the error handling in tsl2x7x_probe()
  staging/iio/mxs-lradc: fix preenable for multiple buffers
  staging: imx-drm: imx-tve: Check the return value of 'regulator_enable()'
  staging: video: imx: Select VIDEOMODE_HELPERS for parallel display
  staging: ramster: add how-to document
  staging: dwc2: Fix dma-enabled platform devices using a default dma_mask
  staging: vt6656: [bug] Fix missing spin lock in iwctl_siwpower.
  staging: Swap zram and zsmalloc in Kconfig
  staging: android: logger: use kuid_t instead of uid_t
  staging: zcache: Fix incorrect module_param_array types
  staging/solo6x10: depend on CONFIG_FONTS
  staging/drm: imx: add missing dependencies
  staging: ste_rmi4: Suppress 'ignoring return value of ‘regulator_enable()' warning
  staging: sep: fix driver build and kconfig
  staging: nvec: cleanup childs on remove
  staging: nvec: implement unregistering of notifiers
  ...
parents c7153d06 0797c3a3

drivers/iio/adc/exynos_adc.c

+4 −4
Original line number Diff line number Diff line
@@ -390,8 +390,8 @@ static int exynos_adc_remove(struct platform_device *pdev) 
#ifdef CONFIG_PM_SLEEP

static int exynos_adc_suspend(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct exynos_adc *info = platform_get_drvdata(pdev);

	struct iio_dev *indio_dev = dev_get_drvdata(dev);

	struct exynos_adc *info = iio_priv(indio_dev);

	u32 con;



	if (info->version == ADC_V2) {
@@ -413,8 +413,8 @@ static int exynos_adc_suspend(struct device *dev) 


static int exynos_adc_resume(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct exynos_adc *info = platform_get_drvdata(pdev);

	struct iio_dev *indio_dev = dev_get_drvdata(dev);

	struct exynos_adc *info = iio_priv(indio_dev);

	int ret;



	ret = regulator_enable(info->vdd);

drivers/iio/common/st_sensors/st_sensors_core.c

+2 −0
Original line number Diff line number Diff line
@@ -312,6 +312,8 @@ int st_sensors_read_info_raw(struct iio_dev *indio_dev, 
			goto read_error;



		*val = *val >> ch->scan_type.shift;



		err = st_sensors_set_enable(indio_dev, false);

	}

	mutex_unlock(&indio_dev->mlock);

drivers/iio/dac/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ menu "Digital to analog converters" 


config AD5064

	tristate "Analog Devices AD5064 and similar multi-channel DAC driver"

	depends on (SPI_MASTER || I2C)

	depends on (SPI_MASTER && I2C!=m) || I2C

	help

	  Say yes here to build support for Analog Devices AD5024, AD5025, AD5044,

	  AD5045, AD5064, AD5064-1, AD5065, AD5628, AD5629R, AD5648, AD5666, AD5668,
@@ -27,7 +27,7 @@ config AD5360 


config AD5380

	tristate "Analog Devices AD5380/81/82/83/84/90/91/92 DAC driver"

	depends on (SPI_MASTER || I2C)

	depends on (SPI_MASTER && I2C!=m) || I2C

	select REGMAP_I2C if I2C

	select REGMAP_SPI if SPI_MASTER

	help
@@ -57,7 +57,7 @@ config AD5624R_SPI 


config AD5446

	tristate "Analog Devices AD5446 and similar single channel DACs driver"

	depends on (SPI_MASTER || I2C)

	depends on (SPI_MASTER && I2C!=m) || I2C

	help

	  Say yes here to build support for Analog Devices AD5300, AD5301, AD5310,

	  AD5311, AD5320, AD5321, AD5444, AD5446, AD5450, AD5451, AD5452, AD5453,

drivers/staging/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -72,10 +72,10 @@ source "drivers/staging/sep/Kconfig" 


source "drivers/staging/iio/Kconfig"



source "drivers/staging/zram/Kconfig"



source "drivers/staging/zsmalloc/Kconfig"



source "drivers/staging/zram/Kconfig"



source "drivers/staging/wlags49_h2/Kconfig"



source "drivers/staging/wlags49_h25/Kconfig"

drivers/staging/android/logger.c

+2 −2
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ static ssize_t do_read_log_to_user(struct logger_log *log, 
 * 'log->buffer' which contains the first entry readable by 'euid'

 */

static size_t get_next_entry_by_uid(struct logger_log *log,

		size_t off, uid_t euid)

		size_t off, kuid_t euid)

{

	while (off != log->w_off) {

		struct logger_entry *entry;
@@ -251,7 +251,7 @@ static size_t get_next_entry_by_uid(struct logger_log *log, 


		entry = get_entry_header(log, off, &scratch);



		if (entry->euid == euid)

		if (uid_eq(entry->euid, euid))

			return off;



		next_len = sizeof(struct logger_entry) + entry->len;