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

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

Merge tag 'char-misc-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char/misc driver fixes from Greg KH:
 "Here are some small char and misc driver fixes for 4.13-rc2. All fix
  reported problems with 4.13-rc1 or older kernels (like the binder
  fixes). Full details in the shortlog.

  All have been in linux-next with no reported issues"

* tag 'char-misc-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  w1: omap-hdq: fix error return code in omap_hdq_probe()
  regmap: regmap-w1: Fix build troubles
  w1: Fix slave count on 1-Wire bus (resend)
  mux: mux-core: unregister mux_class in mux_exit()
  mux: remove the Kconfig question for the subsystem
  nvmem: rockchip-efuse: amend compatible rk322x-efuse to rk3228-efuse
  drivers/fsi: fix fsi_slave_mode prototype
  fsi: core: register with postcore_initcall
  thunderbolt: Correct access permissions for active NVM contents
  vmbus: re-enable channel tasklet
  spmi: pmic-arb: Always allocate ppid_to_apid table
  MAINTAINERS: Add entry for SPMI subsystem
  spmi: Include OF based modalias in device uevent
  binder: Use wake up hint for synchronous transactions.
  binder: use group leader instead of open thread
  Revert "android: binder: Sanity check at binder ioctl"
parents 55fd939e c89876dd

Documentation/devicetree/bindings/nvmem/rockchip-efuse.txt

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ Required properties: 
- compatible: Should be one of the following.

  - "rockchip,rk3066a-efuse" - for RK3066a SoCs.

  - "rockchip,rk3188-efuse" - for RK3188 SoCs.

  - "rockchip,rk322x-efuse" - for RK322x SoCs.

  - "rockchip,rk3228-efuse" - for RK3228 SoCs.

  - "rockchip,rk3288-efuse" - for RK3288 SoCs.

  - "rockchip,rk3399-efuse" - for RK3399 SoCs.

- reg: Should contain the registers location and exact eFuse size

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -12356,6 +12356,15 @@ S: Supported 
F:	Documentation/networking/spider_net.txt

F:	drivers/net/ethernet/toshiba/spider_net*



SPMI SUBSYSTEM

R:	Stephen Boyd <sboyd@codeaurora.org>

L:	linux-arm-msm@vger.kernel.org

F:	Documentation/devicetree/bindings/spmi/

F:	drivers/spmi/

F:	include/dt-bindings/spmi/spmi.h

F:	include/linux/spmi.h

F:	include/trace/events/spmi.h



SPU FILE SYSTEM

M:	Jeremy Kerr <jk@ozlabs.org>

L:	linuxppc-dev@lists.ozlabs.org

drivers/android/binder.c

+8 −9
Original line number Diff line number Diff line
@@ -2200,8 +2200,12 @@ static void binder_transaction(struct binder_proc *proc, 
	list_add_tail(&t->work.entry, target_list);

	tcomplete->type = BINDER_WORK_TRANSACTION_COMPLETE;

	list_add_tail(&tcomplete->entry, &thread->todo);

	if (target_wait)

	if (target_wait) {

		if (reply || !(t->flags & TF_ONE_WAY))

			wake_up_interruptible_sync(target_wait);

		else

			wake_up_interruptible(target_wait);

	}

	return;



err_translate_failed:
@@ -3247,10 +3251,6 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
	/*pr_info("binder_ioctl: %d:%d %x %lx\n",

			proc->pid, current->pid, cmd, arg);*/



	if (unlikely(current->mm != proc->vma_vm_mm)) {

		pr_err("current mm mismatch proc mm\n");

		return -EINVAL;

	}

	trace_binder_ioctl(cmd, arg);



	ret = wait_event_interruptible(binder_user_error_wait, binder_stop_on_user_error < 2);
@@ -3464,9 +3464,8 @@ static int binder_open(struct inode *nodp, struct file *filp) 
	proc = kzalloc(sizeof(*proc), GFP_KERNEL);

	if (proc == NULL)

		return -ENOMEM;

	get_task_struct(current);

	proc->tsk = current;

	proc->vma_vm_mm = current->mm;

	get_task_struct(current->group_leader);

	proc->tsk = current->group_leader;

	INIT_LIST_HEAD(&proc->todo);

	init_waitqueue_head(&proc->wait);

	proc->default_priority = task_nice(current);

drivers/fsi/fsi-core.c

+3 −4
Original line number Diff line number Diff line
@@ -532,7 +532,7 @@ static inline uint32_t fsi_smode_sid(int x) 
	return (x & FSI_SMODE_SID_MASK) << FSI_SMODE_SID_SHIFT;

}



static const uint32_t fsi_slave_smode(int id)

static uint32_t fsi_slave_smode(int id)

{

	return FSI_SMODE_WSC | FSI_SMODE_ECRC

		| fsi_smode_sid(id)
@@ -883,17 +883,16 @@ struct bus_type fsi_bus_type = { 
};

EXPORT_SYMBOL_GPL(fsi_bus_type);



static int fsi_init(void)

static int __init fsi_init(void)

{

	return bus_register(&fsi_bus_type);

}

postcore_initcall(fsi_init);



static void fsi_exit(void)

{

	bus_unregister(&fsi_bus_type);

}



module_init(fsi_init);

module_exit(fsi_exit);

module_param(discard_errors, int, 0664);

MODULE_LICENSE("GPL");

drivers/hv/channel.c

+2 −0
Original line number Diff line number Diff line
@@ -606,6 +606,8 @@ static int vmbus_close_internal(struct vmbus_channel *channel) 
		get_order(channel->ringbuffer_pagecount * PAGE_SIZE));



out:

	/* re-enable tasklet for use on re-open */

	tasklet_enable(&channel->callback_event);

	return ret;

}