From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 28 May 2016 02:14:35 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ed2608faa0f701b1dbc65277a9e5c7ff7118bfd4;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

Pull more input subsystem updates from Dmitry Torokhov:
 "Just a few more driver fixes; new drivers will be coming in the next
  merge window"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: pwm-beeper - fix - scheduling while atomic
  Input: xpad - xbox one elite controller support
  Input: xpad - add more third-party controllers
  Input: xpad - prevent spurious input from wired Xbox 360 controllers
  Input: xpad - move pending clear to the correct location
  Input: uinput - handle compat ioctl for UI_SET_PHYS
---

ed2608faa0f701b1dbc65277a9e5c7ff7118bfd4
diff --cc drivers/input/misc/pwm-beeper.c
index 8d7133268745,18663d4edae5..5f9655d49a65
--- a/drivers/input/misc/pwm-beeper.c
+++ b/drivers/input/misc/pwm-beeper.c
@@@ -87,12 -115,8 +115,14 @@@ static int pwm_beeper_probe(struct plat
  		goto err_free;
  	}
  
 +	/*
 +	 * FIXME: pwm_apply_args() should be removed when switching to
 +	 * the atomic PWM API.
 +	 */
 +	pwm_apply_args(beeper->pwm);
 +
+ 	INIT_WORK(&beeper->work, pwm_beeper_work);
+ 
  	beeper->input = input_allocate_device();
  	if (!beeper->input) {
  		dev_err(&pdev->dev, "Failed to allocate input device\n");