Commit 7db9cbb3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: xilinx_ps2 - fix warning
  Input: bcm5974 - implement autosuspend support
  Input: bcm5974 - add driver for Macbook Air and Pro Penryn touchpads
  Input: paper over a bug in Synaptics X driver
  Input: evdev - split EVIOCGBIT handlig into a separate function
  Input: i8042 - Add Dritek quirk for Acer TravelMate 4280
  Input: xpad - add Pelican Eclipse D-Pad to the list of devices
  Input: gpio-keys - make gpio_keys_device_driver static
  Input: gpio-keys - fix possible NULL pointer dereference
  Input: wm97xx - enable sub-drivers by default
parents ffaa5b98 cbbdece3

drivers/hid/usbhid/hid-quirks.c

+6 −6
Original line number Diff line number Diff line
@@ -654,12 +654,12 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI, HID_QUIRK_APPLE_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS, HID_QUIRK_APPLE_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI, HID_QUIRK_APPLE_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS, HID_QUIRK_APPLE_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD | HID_QUIRK_IGNORE_MOUSE},

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE},

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE},

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD | HID_QUIRK_IGNORE_MOUSE },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS, HID_QUIRK_APPLE_HAS_FN  | HID_QUIRK_IGNORE_MOUSE },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },

drivers/input/evdev.c

+43 −20
Original line number Diff line number Diff line
@@ -647,6 +647,47 @@ static int str_to_user(const char *str, unsigned int maxlen, void __user *p) 
	return copy_to_user(p, str, len) ? -EFAULT : len;

}



#define OLD_KEY_MAX	0x1ff

static int handle_eviocgbit(struct input_dev *dev, unsigned int cmd, void __user *p, int compat_mode)

{

	static unsigned long keymax_warn_time;

	unsigned long *bits;

	int len;



	switch (_IOC_NR(cmd) & EV_MAX) {



	case      0: bits = dev->evbit;  len = EV_MAX;  break;

	case EV_KEY: bits = dev->keybit; len = KEY_MAX; break;

	case EV_REL: bits = dev->relbit; len = REL_MAX; break;

	case EV_ABS: bits = dev->absbit; len = ABS_MAX; break;

	case EV_MSC: bits = dev->mscbit; len = MSC_MAX; break;

	case EV_LED: bits = dev->ledbit; len = LED_MAX; break;

	case EV_SND: bits = dev->sndbit; len = SND_MAX; break;

	case EV_FF:  bits = dev->ffbit;  len = FF_MAX;  break;

	case EV_SW:  bits = dev->swbit;  len = SW_MAX;  break;

	default: return -EINVAL;

	}



	/*

	 * Work around bugs in userspace programs that like to do

	 * EVIOCGBIT(EV_KEY, KEY_MAX) and not realize that 'len'

	 * should be in bytes, not in bits.

	 */

	if ((_IOC_NR(cmd) & EV_MAX) == EV_KEY && _IOC_SIZE(cmd) == OLD_KEY_MAX) {

		len = OLD_KEY_MAX;

		if (printk_timed_ratelimit(&keymax_warn_time, 10 * 1000))

			printk(KERN_WARNING

				"evdev.c(EVIOCGBIT): Suspicious buffer size %d, "

				"limiting output to %d bytes. See "

				"http://userweb.kernel.org/~dtor/eviocgbit-bug.html\n",

				OLD_KEY_MAX,

				BITS_TO_LONGS(OLD_KEY_MAX) * sizeof(long));

	}



	return bits_to_user(bits, len, _IOC_SIZE(cmd), p, compat_mode);

}

#undef OLD_KEY_MAX



static long evdev_do_ioctl(struct file *file, unsigned int cmd,

			   void __user *p, int compat_mode)

{
@@ -733,26 +774,8 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd, 


		if (_IOC_DIR(cmd) == _IOC_READ) {



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



				unsigned long *bits;

				int len;



				switch (_IOC_NR(cmd) & EV_MAX) {



				case      0: bits = dev->evbit;  len = EV_MAX;  break;

				case EV_KEY: bits = dev->keybit; len = KEY_MAX; break;

				case EV_REL: bits = dev->relbit; len = REL_MAX; break;

				case EV_ABS: bits = dev->absbit; len = ABS_MAX; break;

				case EV_MSC: bits = dev->mscbit; len = MSC_MAX; break;

				case EV_LED: bits = dev->ledbit; len = LED_MAX; break;

				case EV_SND: bits = dev->sndbit; len = SND_MAX; break;

				case EV_FF:  bits = dev->ffbit;  len = FF_MAX;  break;

				case EV_SW:  bits = dev->swbit;  len = SW_MAX;  break;

				default: return -EINVAL;

				}

				return bits_to_user(bits, len, _IOC_SIZE(cmd), p, compat_mode);

			}

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

				return handle_eviocgbit(dev, cmd, p, compat_mode);



			if (_IOC_NR(cmd) == _IOC_NR(EVIOCGKEY(0)))

				return bits_to_user(dev->key, KEY_MAX, _IOC_SIZE(cmd),

drivers/input/joystick/xpad.c

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ static const struct xpad_device { 
	{ 0x0738, 0x4716, "Mad Catz Wired Xbox 360 Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX360 },

	{ 0x0738, 0x6040, "Mad Catz Beat Pad Pro", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },

	{ 0x0c12, 0x8802, "Zeroplus Xbox Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },

	{ 0x0c12, 0x880a, "Pelican Eclipse PL-2023", MAP_DPAD_TO_AXES, XTYPE_XBOX },

	{ 0x0c12, 0x8810, "Zeroplus Xbox Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },

	{ 0x0c12, 0x9902, "HAMA VibraX - *FAULTY HARDWARE*", MAP_DPAD_TO_AXES, XTYPE_XBOX },

	{ 0x0e4c, 0x1097, "Radica Gamester Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },

drivers/input/keyboard/gpio_keys.c

+2 −1
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) 
		unsigned int type = button->type ?: EV_KEY;



		bdata->input = input;

		bdata->button = button;

		setup_timer(&bdata->timer,

			    gpio_check_button, (unsigned long)bdata);
@@ -256,7 +257,7 @@ static int gpio_keys_resume(struct platform_device *pdev) 
#define gpio_keys_resume	NULL

#endif



struct platform_driver gpio_keys_device_driver = {

static struct platform_driver gpio_keys_device_driver = {

	.probe		= gpio_keys_probe,

	.remove		= __devexit_p(gpio_keys_remove),

	.suspend	= gpio_keys_suspend,

drivers/input/mouse/Kconfig

+23 −0
Original line number Diff line number Diff line
@@ -130,6 +130,29 @@ config MOUSE_APPLETOUCH 
	  To compile this driver as a module, choose M here: the

	  module will be called appletouch.



config MOUSE_BCM5974

	tristate "Apple USB BCM5974 Multitouch trackpad support"

	depends on USB_ARCH_HAS_HCD

	select USB

	help

	  Say Y here if you have an Apple USB BCM5974 Multitouch

	  trackpad.



	  The BCM5974 is the multitouch trackpad found in the Macbook

	  Air (JAN2008) and Macbook Pro Penryn (FEB2008) laptops.



	  It is also found in the IPhone (2007) and Ipod Touch (2008).



	  This driver provides multitouch functionality together with

	  the synaptics X11 driver.



	  The interface is currently identical to the appletouch interface,

	  for further information, see

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



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

	  module will be called bcm5974.



config MOUSE_INPORT

	tristate "InPort/MS/ATIXL busmouse"

	depends on ISA

CRA Git | Maintained and supported by SUSTech CRA and CCSE