Commit 393bfca1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input 

* master.kernel.org:/pub/scm/linux/kernel/git/dtor/input:
  Input: move USB miscellaneous devices under drivers/input/misc
  Input: move USB mice under drivers/input/mouse
  Input: move USB gamepads under drivers/input/joystick
  Input: move USB touchscreens under drivers/input/touchscreen
  Input: move USB tablets under drivers/input/tablet
  Input: i8042 - fix AUX port detection with some chips
  Input: aaed2000_kbd - convert to use polldev library
  Input: drivers/usb/input - usb_buffer_free() cleanup
  Input: synaptics - don't complain about failed resets
  Input: pull input.h into uinpit.h
  Input: drivers/usb/input - fix sparse warnings (signedness)
  Input: evdev - fix some sparse warnings (signedness, shadowing)
  Input: drivers/joystick - fix various sparse warnings
  Input: force feedback - make sure effect is present before playing
parents df6d3916 ba0acb5e

drivers/input/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -153,6 +153,8 @@ source "drivers/input/mouse/Kconfig" 


source "drivers/input/joystick/Kconfig"



source "drivers/input/tablet/Kconfig"



source "drivers/input/touchscreen/Kconfig"



source "drivers/input/misc/Kconfig"

drivers/input/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ obj-$(CONFIG_INPUT_EVBUG) += evbug.o 
obj-$(CONFIG_INPUT_KEYBOARD)	+= keyboard/

obj-$(CONFIG_INPUT_MOUSE)	+= mouse/

obj-$(CONFIG_INPUT_JOYSTICK)	+= joystick/

obj-$(CONFIG_INPUT_TABLET)	+= tablet/

obj-$(CONFIG_INPUT_TOUCHSCREEN)	+= touchscreen/

obj-$(CONFIG_INPUT_MISC)	+= misc/

drivers/input/evdev.c

+3 −3
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ static long evdev_ioctl_handler(struct file *file, unsigned int cmd, 


				if ((_IOC_NR(cmd) & ~EV_MAX) == _IOC_NR(EVIOCGBIT(0,0))) {



					long *bits;

					unsigned long *bits;

					int len;



					switch (_IOC_NR(cmd) & EV_MAX) {
@@ -556,7 +556,7 @@ static long evdev_ioctl_handler(struct file *file, unsigned int cmd, 


				if ((_IOC_NR(cmd) & ~ABS_MAX) == _IOC_NR(EVIOCGABS(0))) {



					int t = _IOC_NR(cmd) & ABS_MAX;

					t = _IOC_NR(cmd) & ABS_MAX;



					abs.value = dev->abs[t];

					abs.minimum = dev->absmin[t];
@@ -576,7 +576,7 @@ static long evdev_ioctl_handler(struct file *file, unsigned int cmd, 


				if ((_IOC_NR(cmd) & ~ABS_MAX) == _IOC_NR(EVIOCSABS(0))) {



					int t = _IOC_NR(cmd) & ABS_MAX;

					t = _IOC_NR(cmd) & ABS_MAX;



					if (copy_from_user(&abs, p, sizeof(struct input_absinfo)))

						return -EFAULT;

drivers/input/ff-core.c

+2 −1
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ int input_ff_event(struct input_dev *dev, unsigned int type, 
		break;



	default:

		if (check_effect_access(ff, code, NULL) == 0)

			ff->playback(dev, code, value);

		break;

	}

drivers/input/joystick/Kconfig

+16 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Joystick driver configuration

#

menuconfig INPUT_JOYSTICK

	bool "Joysticks"

	bool "Joysticks/Gamepads"

	help

	  If you have a joystick, 6dof controller, gamepad, steering wheel,

	  weapon control system or something like that you can say Y here
@@ -196,7 +196,7 @@ config JOYSTICK_TWIDJOY 
config JOYSTICK_DB9

	tristate "Multisystem, Sega Genesis, Saturn joysticks and gamepads"

	depends on PARPORT

	---help---

	help

	  Say Y here if you have a Sega Master System gamepad, Sega Genesis

	  gamepad, Sega Saturn gamepad, or a Multisystem -- Atari, Amiga,

	  Commodore, Amstrad CPC joystick connected to your parallel port.
@@ -253,4 +253,18 @@ config JOYSTICK_JOYDUMP 
	  To compile this driver as a module, choose M here: the

	  module will be called joydump.



config JOYSTICK_XPAD

	tristate "X-Box gamepad support"

	select USB

	help

	  Say Y here if you want to use the X-Box pad with your computer.

	  Make sure to say Y to "Joystick support" (CONFIG_INPUT_JOYDEV)

	  and/or "Event interface support" (CONFIG_INPUT_EVDEV) as well.



	  For information about how to connect the X-Box pad to USB, see

	  <file:Documentation/input/xpad.txt>.



	  To compile this driver as a module, choose M here: the

	  module will be called xpad.



endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE