Commit ce1d5b23 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: (40 commits)
  Input: wacom - add support for Cintiq 20WSX
  Input: ucb1400_ts - IRQ probe fix
  Input: at32psif - update MODULE_AUTHOR with new email
  Input: mac_hid - add lockdep annotation to emumousebtn
  Input: i8042 - fix incorrect usage of strncpy and strncat
  Input: bf54x-keys - add infrastructure for keypad wakeups
  Input: add MODULE_ALIAS() to hotpluggable platform modules
  Input: drivers/char/keyboard.c - use time_after
  Input: fix ordering in joystick Makefile
  Input: wm97xx-core - support use as a wakeup source
  Input: wm97xx-core - use IRQF_SAMPLE_RANDOM
  Input: wm97xx-core - only schedule interrupt handler if not already scheduled
  Input: add Zhen Hua driver
  Input: aiptek - add support for Genius G-PEN 560 tablet
  Input: wacom - implement suspend and autosuspend
  Input: xpad - set proper buffer length for outgoing requests
  Input: omap-keypad - fix build warning
  Input: gpio_keys - irq handling cleanup
  Input: add PS/2 serio driver for AVR32 devices
  Input: put ledstate in the keyboard notifier
  ...
parents ad5e1b0f 308f0a58

MAINTAINERS

+10 −0
Original line number Diff line number Diff line
@@ -4356,6 +4356,16 @@ L: linux-wireless@vger.kernel.org 
W:	http://oops.ghostprotocols.net:81/blog

S:	Maintained



WM97XX TOUCHSCREEN DRIVERS

P:	Mark Brown

M:	broonie@opensource.wolfsonmicro.com

P:	Liam Girdwood

M:	liam.girdwood@wolfsonmicro.com

L:	linux-input@vger.kernel.org

T:	git git://opensource.wolfsonmicro.com/linux-2.6-touch

W:	http://opensource.wolfsonmicro.com/node/7

S:	Supported



X.25 NETWORK LAYER

P:	Henner Eisen

M:	eis@baty.hanse.de

drivers/char/keyboard.c

+5 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include <linux/input.h>

#include <linux/reboot.h>

#include <linux/notifier.h>

#include <linux/jiffies.h>



extern void ctrl_alt_del(void);
@@ -928,7 +929,8 @@ static void k_brl(struct vc_data *vc, unsigned char value, char up_flag) 
	if (up_flag) {

		if (brl_timeout) {

			if (!committing ||

			    jiffies - releasestart > (brl_timeout * HZ) / 1000) {

			    time_after(jiffies,

				       releasestart + msecs_to_jiffies(brl_timeout))) {

				committing = pressed;

				releasestart = jiffies;

			}
@@ -1238,6 +1240,7 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw) 
	}



	param.shift = shift_final = (shift_state | kbd->slockstate) ^ kbd->lockstate;

	param.ledstate = kbd->ledflagstate;

	key_map = key_maps[shift_final];



	if (atomic_notifier_call_chain(&keyboard_notifier_list, KBD_KEYCODE, &param) == NOTIFY_STOP || !key_map) {
@@ -1286,6 +1289,7 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw) 


	(*k_handler[type])(vc, keysym & 0xff, !down);



	param.ledstate = kbd->ledflagstate;

	atomic_notifier_call_chain(&keyboard_notifier_list, KBD_POST_KEYSYM, &param);



	if (type != KT_SLOCK)

drivers/hid/usbhid/hid-quirks.c

+4 −0
Original line number Diff line number Diff line
@@ -405,6 +405,9 @@ 
#define USB_VENDOR_ID_YEALINK		0x6993

#define USB_DEVICE_ID_YEALINK_P1K_P4K_B2K	0xb001



#define USB_VENDOR_ID_KYE		0x0458

#define USB_DEVICE_ID_KYE_GPEN_560	0x5003



/*

 * Alphabetically sorted blacklist by quirk type.

 */
@@ -698,6 +701,7 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_63, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_64, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR, USB_DEVICE_ID_N_S_HARMONY, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_GPEN_560, HID_QUIRK_IGNORE },



	{ 0, 0 }

};

drivers/input/input-polldev.c

+3 −3
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static void input_polled_device_work(struct work_struct *work) 


static int input_open_polled_device(struct input_dev *input)

{

	struct input_polled_dev *dev = input->private;

	struct input_polled_dev *dev = input_get_drvdata(input);

	int error;



	error = input_polldev_start_workqueue();
@@ -91,7 +91,7 @@ static int input_open_polled_device(struct input_dev *input) 


static void input_close_polled_device(struct input_dev *input)

{

	struct input_polled_dev *dev = input->private;

	struct input_polled_dev *dev = input_get_drvdata(input);



	cancel_delayed_work_sync(&dev->work);

	input_polldev_stop_workqueue();
@@ -151,10 +151,10 @@ int input_register_polled_device(struct input_polled_dev *dev) 
{

	struct input_dev *input = dev->input;



	input_set_drvdata(input, dev);

	INIT_DELAYED_WORK(&dev->work, input_polled_device_work);

	if (!dev->poll_interval)

		dev->poll_interval = 500;

	input->private = dev;

	input->open = input_open_polled_device;

	input->close = input_close_polled_device;

drivers/input/joystick/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -193,6 +193,18 @@ config JOYSTICK_TWIDJOY 
	  To compile this driver as a module, choose M here: the

	  module will be called twidjoy.



config JOYSTICK_ZHENHUA

	tristate "5-byte Zhenhua RC transmitter"

	select SERIO

	help

	  Say Y here if you have a Zhen Hua PPM-4CH transmitter which is

	  supplied with a ready to fly micro electric indoor helicopters

	  such as EasyCopter, Lama, MiniCopter, DragonFly or Jabo and want

	  to use it via serial cable as a joystick.



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

	  module will be called zhenhua.



config JOYSTICK_DB9

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

	depends on PARPORT

CRA Git | Maintained and supported by SUSTech CRA and CCSE