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

Commit 3ab47029 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'driver-core-linus' of... 

Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

* 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
  drivers:misc: ti-st: fix unexpected UART close
  drivers:misc: ti-st: free skb on firmware download
  drivers:misc: ti-st: wait for completion at fail
  drivers:misc: ti-st: reinit completion before send
  drivers:misc: ti-st: fail-safe on wrong pkt type
  drivers:misc: ti-st: reinit completion on ver read
  drivers:misc:ti-st: platform hooks for chip states
  drivers:misc: ti-st: avoid a misleading dbg msg
  base/devres.c: quiet sparse noise about context imbalance
  pti: add missing CONFIG_PCI dependency
  drivers/base/devtmpfs.c: correct annotation of `setup_done'
  driver core: fix kernel-doc warning in platform.c
  firmware: fix google/gsmi.c build warning
parents 0cf0adb0 651d62a8

drivers/base/devres.c

+1 −0
Original line number Diff line number Diff line
@@ -397,6 +397,7 @@ static int remove_nodes(struct device *dev, 


static int release_nodes(struct device *dev, struct list_head *first,

			 struct list_head *end, unsigned long flags)

	__releases(&dev->devres_lock)

{

	LIST_HEAD(todo);

	int cnt;

drivers/base/devtmpfs.c

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ int devtmpfs_mount(const char *mntdir) 
	return err;

}



static __initdata DECLARE_COMPLETION(setup_done);

static DECLARE_COMPLETION(setup_done);



static int handle(const char *name, mode_t mode, struct device *dev)

{

drivers/base/platform.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ EXPORT_SYMBOL_GPL(platform_bus); 


/**

 * arch_setup_pdev_archdata - Allow manipulation of archdata before its used

 * @dev: platform device

 * @pdev: platform device

 *

 * This is called before platform_device_add() such that any pdev_archdata may

 * be setup before the platform_notifier is called.  So if a user needs to

drivers/firmware/google/gsmi.c

+1 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ static efi_status_t gsmi_get_next_variable(unsigned long *name_size, 


static efi_status_t gsmi_set_variable(efi_char16_t *name,

				      efi_guid_t *vendor,

				      unsigned long attr,

				      u32 attr,

				      unsigned long data_size,

				      void *data)

{

drivers/misc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ config PHANTOM 


config INTEL_MID_PTI

	tristate "Parallel Trace Interface for MIPI P1149.7 cJTAG standard"

	depends on PCI

	default n

	help

	  The PTI (Parallel Trace Interface) driver directs