Commit 8b97be05 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging driver fixes from Greg KH:
 "Here are some fixes that poped up due to the big staging tree merge,
  as well as the removal of a staging driver that now is covered by a
  "real" driver.

  All of these have been in linux-next for a few days with no reported
  issues"

* tag 'staging-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: delete STE RMI4 hackish driver
  staging: android: ion_test: fix check of platform_device_register_simple() error code
  staging: wilc1000: fix a couple of memory leaks
  staging: fsl-mc: fix incorrect type passed to dev_err macros
  staging: fsl-mc: fix incorrect type passed to dev_dbg macros
  staging: wilc1000: fixed kernel panic when firmware is not started
  staging: comedi: ni_mio_common: fix the ni_write[blw]() functions
  staging: most: hdm-dim2: Remove possible dereference error
  staging: lustre: checking for NULL instead of IS_ERR
  staging: lustre: really make lustre dependent on LNet
  staging: refresh TODO for rtl8712
  staging: refresh TODO for rtl8723au
parents 44d1b6dd 8bb7e27b

drivers/staging/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -60,8 +60,6 @@ source "drivers/staging/emxx_udc/Kconfig" 


source "drivers/staging/speakup/Kconfig"



source "drivers/staging/ste_rmi4/Kconfig"



source "drivers/staging/nvec/Kconfig"



source "drivers/staging/media/Kconfig"

drivers/staging/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ obj-$(CONFIG_FB_SM750) += sm750fb/ 
obj-$(CONFIG_FB_XGI)		+= xgifb/

obj-$(CONFIG_USB_EMXX)		+= emxx_udc/

obj-$(CONFIG_SPEAKUP)		+= speakup/

obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4)	+= ste_rmi4/

obj-$(CONFIG_MFD_NVEC)		+= nvec/

obj-$(CONFIG_STAGING_RDMA)	+= rdma/

obj-$(CONFIG_ANDROID)		+= android/

drivers/staging/android/ion/ion_test.c

+2 −2
Original line number Diff line number Diff line
@@ -285,8 +285,8 @@ static int __init ion_test_init(void) 
{

	ion_test_pdev = platform_device_register_simple("ion-test",

							-1, NULL, 0);

	if (!ion_test_pdev)

		return -ENODEV;

	if (IS_ERR(ion_test_pdev))

		return PTR_ERR(ion_test_pdev);



	return platform_driver_probe(&ion_test_platform_driver, ion_test_probe);

}

drivers/staging/comedi/drivers/ni_mio_common.c

+6 −6
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static void ni_writel(struct comedi_device *dev, uint32_t data, int reg) 
{

	if (dev->mmio)

		writel(data, dev->mmio + reg);



	else

		outl(data, dev->iobase + reg);

}
@@ -254,7 +254,7 @@ static void ni_writew(struct comedi_device *dev, uint16_t data, int reg) 
{

	if (dev->mmio)

		writew(data, dev->mmio + reg);



	else

		outw(data, dev->iobase + reg);

}
@@ -262,7 +262,7 @@ static void ni_writeb(struct comedi_device *dev, uint8_t data, int reg) 
{

	if (dev->mmio)

		writeb(data, dev->mmio + reg);



	else

		outb(data, dev->iobase + reg);

}

drivers/staging/fsl-mc/bus/mc-bus.c

+2 −2
Original line number Diff line number Diff line
@@ -260,14 +260,14 @@ static int get_dprc_icid(struct fsl_mc_io *mc_io, 


	error = dprc_open(mc_io, 0, container_id, &dprc_handle);

	if (error < 0) {

		dev_err(&mc_io->dev, "dprc_open() failed: %d\n", error);

		dev_err(mc_io->dev, "dprc_open() failed: %d\n", error);

		return error;

	}



	memset(&attr, 0, sizeof(attr));

	error = dprc_get_attributes(mc_io, 0, dprc_handle, &attr);

	if (error < 0) {

		dev_err(&mc_io->dev, "dprc_get_attributes() failed: %d\n",

		dev_err(mc_io->dev, "dprc_get_attributes() failed: %d\n",

			error);

		goto common_cleanup;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE