]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 May 2016 02:14:35 +0000 (19:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 May 2016 02:14:35 +0000 (19:14 -0700)
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

1  2 
drivers/input/misc/pwm-beeper.c
drivers/input/misc/uinput.c

index 8d71332687455d51d0391d2f5425d3cbf48edd8f,18663d4edae5be089b112f5a0c3f830ae3ca432c..5f9655d49a65475f4e64a6ac85de5b34f33ee321
@@@ -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");
Simple merge