Commit a818d8e4 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: i8042 - add ALDI/MEDION netbook E1222 to qurik reset table
  Input: ALPS - fix stuck buttons on some touchpads
  Input: wm831x-on - convert to use genirq
  Input: ads7846 - add wakeup support
  Input: appletouch - fix integer overflow issue
  Input: ad7877 - increase pen up imeout
  Input: ads7846 - add support for AD7843 parts
  Input: bf54x-keys - fix system hang when pressing a key
  Input: alps - add support for the touchpad on Toshiba Tecra A11-11L
  Input: remove BKL, fix input_open_file() locking
  Input: serio_raw - remove BKL
  Input: mousedev - remove BKL
  Input: add driver for TWL4030 vibrator device
  Input: enable remote wakeup for PNP i8042 keyboard ports
  Input: scancode in get/set_keycodes should be unsigned
  Input: i8042 - use platfrom_create_bundle() helper
  Input: wacom - merge out and in prox events
  Input: gamecon - fix off by one range check
  Input: wacom - replace WACOM_PKGLEN_PENABLED
parents f901e753 31968ecf

drivers/hid/hid-input.c

+12 −12
Original line number Original line Diff line number Diff line
@@ -68,22 +68,25 @@ static const struct { 
#define map_key_clear(c)	hid_map_usage_clear(hidinput, usage, &bit, \

#define map_key_clear(c)	hid_map_usage_clear(hidinput, usage, &bit, \

		&max, EV_KEY, (c))

		&max, EV_KEY, (c))





static inline int match_scancode(int code, int scancode)

static inline int match_scancode(unsigned int code, unsigned int scancode)

{

{

	if (scancode == 0)

	if (scancode == 0)

		return 1;

		return 1;

	return ((code & (HID_USAGE_PAGE | HID_USAGE)) == scancode);



	return (code & (HID_USAGE_PAGE | HID_USAGE)) == scancode;

}

}





static inline int match_keycode(int code, int keycode)

static inline int match_keycode(unsigned int code, unsigned int keycode)

{

{

	if (keycode == 0)

	if (keycode == 0)

		return 1;

		return 1;

	return (code == keycode);



	return code == keycode;

}

}





static struct hid_usage *hidinput_find_key(struct hid_device *hid,

static struct hid_usage *hidinput_find_key(struct hid_device *hid,

		int scancode, int keycode)

					   unsigned int scancode,

					   unsigned int keycode)

{

{

	int i, j, k;

	int i, j, k;

	struct hid_report *report;

	struct hid_report *report;
@@ -105,8 +108,8 @@ static struct hid_usage *hidinput_find_key(struct hid_device *hid, 
	return NULL;

	return NULL;

}

}





static int hidinput_getkeycode(struct input_dev *dev, int scancode,

static int hidinput_getkeycode(struct input_dev *dev,

				int *keycode)

			       unsigned int scancode, unsigned int *keycode)

{

{

	struct hid_device *hid = input_get_drvdata(dev);

	struct hid_device *hid = input_get_drvdata(dev);

	struct hid_usage *usage;

	struct hid_usage *usage;
@@ -119,16 +122,13 @@ static int hidinput_getkeycode(struct input_dev *dev, int scancode, 
	return -EINVAL;

	return -EINVAL;

}

}





static int hidinput_setkeycode(struct input_dev *dev, int scancode,

static int hidinput_setkeycode(struct input_dev *dev,

				int keycode)

			       unsigned int scancode, unsigned int keycode)

{

{

	struct hid_device *hid = input_get_drvdata(dev);

	struct hid_device *hid = input_get_drvdata(dev);

	struct hid_usage *usage;

	struct hid_usage *usage;

	int old_keycode;

	int old_keycode;





	if (keycode < 0 || keycode > KEY_MAX)

		return -EINVAL;



	usage = hidinput_find_key(hid, scancode, 0);

	usage = hidinput_find_key(hid, scancode, 0);

	if (usage) {

	if (usage) {

		old_keycode = usage->code;

		old_keycode = usage->code;

drivers/input/evdev.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -515,7 +515,7 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd, 
	struct input_absinfo abs;

	struct input_absinfo abs;

	struct ff_effect effect;

	struct ff_effect effect;

	int __user *ip = (int __user *)p;

	int __user *ip = (int __user *)p;

	int i, t, u, v;

	unsigned int i, t, u, v;

	int error;

	int error;





	switch (cmd) {

	switch (cmd) {

drivers/input/input.c

+19 −19
Original line number Original line Diff line number Diff line
@@ -582,7 +582,8 @@ static int input_fetch_keycode(struct input_dev *dev, int scancode) 
}

}





static int input_default_getkeycode(struct input_dev *dev,

static int input_default_getkeycode(struct input_dev *dev,

				    int scancode, int *keycode)

				    unsigned int scancode,

				    unsigned int *keycode)

{

{

	if (!dev->keycodesize)

	if (!dev->keycodesize)

		return -EINVAL;

		return -EINVAL;
@@ -596,7 +597,8 @@ static int input_default_getkeycode(struct input_dev *dev, 
}

}





static int input_default_setkeycode(struct input_dev *dev,

static int input_default_setkeycode(struct input_dev *dev,

				    int scancode, int keycode)

				    unsigned int scancode,

				    unsigned int keycode)

{

{

	int old_keycode;

	int old_keycode;

	int i;

	int i;
@@ -654,11 +656,9 @@ static int input_default_setkeycode(struct input_dev *dev, 
 * This function should be called by anyone interested in retrieving current

 * This function should be called by anyone interested in retrieving current

 * keymap. Presently keyboard and evdev handlers use it.

 * keymap. Presently keyboard and evdev handlers use it.

 */

 */

int input_get_keycode(struct input_dev *dev, int scancode, int *keycode)

int input_get_keycode(struct input_dev *dev,

		      unsigned int scancode, unsigned int *keycode)

{

{

	if (scancode < 0)

		return -EINVAL;



	return dev->getkeycode(dev, scancode, keycode);

	return dev->getkeycode(dev, scancode, keycode);

}

}

EXPORT_SYMBOL(input_get_keycode);

EXPORT_SYMBOL(input_get_keycode);
@@ -672,16 +672,14 @@ EXPORT_SYMBOL(input_get_keycode); 
 * This function should be called by anyone needing to update current

 * This function should be called by anyone needing to update current

 * keymap. Presently keyboard and evdev handlers use it.

 * keymap. Presently keyboard and evdev handlers use it.

 */

 */

int input_set_keycode(struct input_dev *dev, int scancode, int keycode)

int input_set_keycode(struct input_dev *dev,

		      unsigned int scancode, unsigned int keycode)

{

{

	unsigned long flags;

	unsigned long flags;

	int old_keycode;

	int old_keycode;

	int retval;

	int retval;





	if (scancode < 0)

	if (keycode > KEY_MAX)

		return -EINVAL;



	if (keycode < 0 || keycode > KEY_MAX)

		return -EINVAL;

		return -EINVAL;





	spin_lock_irqsave(&dev->event_lock, flags);

	spin_lock_irqsave(&dev->event_lock, flags);
@@ -1881,35 +1879,37 @@ static int input_open_file(struct inode *inode, struct file *file) 
	const struct file_operations *old_fops, *new_fops = NULL;

	const struct file_operations *old_fops, *new_fops = NULL;

	int err;

	int err;





	lock_kernel();

	err = mutex_lock_interruptible(&input_mutex);

	if (err)

		return err;



	/* No load-on-demand here? */

	/* No load-on-demand here? */

	handler = input_table[iminor(inode) >> 5];

	handler = input_table[iminor(inode) >> 5];

	if (!handler || !(new_fops = fops_get(handler->fops))) {

	if (handler)

		err = -ENODEV;

		new_fops = fops_get(handler->fops);

		goto out;



	}

	mutex_unlock(&input_mutex);





	/*

	/*

	 * That's _really_ odd. Usually NULL ->open means "nothing special",

	 * That's _really_ odd. Usually NULL ->open means "nothing special",

	 * not "no device". Oh, well...

	 * not "no device". Oh, well...

	 */

	 */

	if (!new_fops->open) {

	if (!new_fops || !new_fops->open) {

		fops_put(new_fops);

		fops_put(new_fops);

		err = -ENODEV;

		err = -ENODEV;

		goto out;

		goto out;

	}

	}



	old_fops = file->f_op;

	old_fops = file->f_op;

	file->f_op = new_fops;

	file->f_op = new_fops;





	err = new_fops->open(inode, file);

	err = new_fops->open(inode, file);



	if (err) {

	if (err) {

		fops_put(file->f_op);

		fops_put(file->f_op);

		file->f_op = fops_get(old_fops);

		file->f_op = fops_get(old_fops);

	}

	}

	fops_put(old_fops);

	fops_put(old_fops);

out:

out:

	unlock_kernel();

	return err;

	return err;

}

}

drivers/input/joystick/gamecon.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -819,7 +819,7 @@ static int __init gc_setup_pad(struct gc *gc, int idx, int pad_type) 
	int i;

	int i;

	int err;

	int err;





	if (pad_type < 1 || pad_type > GC_MAX) {

	if (pad_type < 1 || pad_type >= GC_MAX) {

		pr_err("Pad type %d unknown\n", pad_type);

		pr_err("Pad type %d unknown\n", pad_type);

		return -EINVAL;

		return -EINVAL;

	}

	}

drivers/input/keyboard/bf54x-keys.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -162,7 +162,7 @@ static irqreturn_t bfin_kpad_isr(int irq, void *dev_id) 
	input_sync(input);

	input_sync(input);





	if (bfin_kpad_get_keypressed(bf54x_kpad)) {

	if (bfin_kpad_get_keypressed(bf54x_kpad)) {

		disable_irq(bf54x_kpad->irq);

		disable_irq_nosync(bf54x_kpad->irq);

		bf54x_kpad->lastkey = key;

		bf54x_kpad->lastkey = key;

		mod_timer(&bf54x_kpad->timer,

		mod_timer(&bf54x_kpad->timer,

			  jiffies + bf54x_kpad->keyup_test_jiffies);

			  jiffies + bf54x_kpad->keyup_test_jiffies);

CRA Git | Maintained and supported by SUSTech CRA and CCSE