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

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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (27 commits)
  Staging: sep: return -EFAULT on copy_to_user errors
  Staging: rc2860: return -EFAULT on copy_to_user errors
  Staging: Eliminate a NULL pointer dereference
  staging: Use GFP_ATOMIC when a lock is held
  Staging: comedi - correct parameter gainlkup for DAQCard-6024E in driver ni_mio_cs.c
  Staging: comedi: fixing ni_labpc to mite dependancy
  Staging: wlags49_h2, wlags49_h25: fixed Kconfig dependencies
  Staging: phison: depends on ATA_BMDMA
  Staging: iio-utils: fix memory overflow for dynamically allocateded memory to hold filename
  Staging: adis16255: add proper section markings to hotplug funcs
  Staging: adis16255: fix typo in Kconfig
  Staging: batman-adv: Don't allocate icmp packet with GFP_KERNEL
  Staging: batman-adv: Don't call free_netdev twice
  Staging: batman-adv: Call unregister_netdev on failures to get rtnl lock
  Staging: batman-adv: fix rogue packets on shutdown
  Staging: add MSM framebuffer driver
  Staging: comedi: fixing ni_tio to mite PCI dependancy
  Staging: comedi: fix 8255 and DAS08 Kconfig dependancies.
  Staging: comedi: For COMEDI_BUFINFO, check access to command
  Staging: comedi: COMEDI_BUFINFO with no async - report no bytes read or written
  ...
parents f9196e7c 640f7dcf

drivers/staging/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -141,5 +141,11 @@ source "drivers/staging/ti-st/Kconfig" 


source "drivers/staging/adis16255/Kconfig"



source "drivers/staging/xgifb/Kconfig"



source "drivers/staging/mrst-touchscreen/Kconfig"



source "drivers/staging/msm/Kconfig"



endif # !STAGING_EXCLUDE_BUILD

endif # STAGING

drivers/staging/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -51,3 +51,6 @@ obj-$(CONFIG_CRYSTALHD) += crystalhd/ 
obj-$(CONFIG_CXT1E1)		+= cxt1e1/

obj-$(CONFIG_TI_ST)		+= ti-st/

obj-$(CONFIG_ADIS16255)		+= adis16255/

obj-$(CONFIG_FB_XGI)		+= xgifb/

obj-$(CONFIG_TOUCHSCREEN_MRSTOUCH)	+= mrst-touchscreen/

obj-$(CONFIG_MSM_STAGING)	+= msm/

drivers/staging/adis16255/Kconfig

+1 −1
Original line number Diff line number Diff line 
config ADIS16255

	tristate "Ananlog Devices ADIS16250/16255"

	tristate "Analog Devices ADIS16250/16255"

	depends on SPI && SYSFS

	---help---

	If you say yes here you get support for the Analog Devices

drivers/staging/adis16255/adis16255.c

+2 −2
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ err: 


/*-------------------------------------------------------------------------*/



static int spi_adis16255_probe(struct spi_device *spi)

static int __devinit spi_adis16255_probe(struct spi_device *spi)

{



	struct adis16255_init_data *init_data = spi->dev.platform_data;
@@ -421,7 +421,7 @@ err: 
	return status;

}



static int spi_adis16255_remove(struct spi_device *spi)

static int __devexit spi_adis16255_remove(struct spi_device *spi)

{

	struct spi_adis16255_data  *spiadis    = dev_get_drvdata(&spi->dev);

drivers/staging/batman-adv/device.c

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ void bat_device_add_packet(struct device_client *device_client, 
	struct device_packet *device_packet;

	unsigned long flags;



	device_packet = kmalloc(sizeof(struct device_packet), GFP_KERNEL);

	device_packet = kmalloc(sizeof(struct device_packet), GFP_ATOMIC);



	if (!device_packet)

		return;