Commit 3b3ef308 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: sentelic - fix left/right horizontal scroll mapping
  Input: pmouse - move Sentelic probe down the list
  Input: add compat support for sysfs and /proc capabilities output
  Input: i8042 - add Dritek quirk for Acer Aspire 5610.
  Input: xbox - do not use GFP_KERNEL under spinlock
  Input: psmouse - fix Synaptics detection when protocol is disabled
  Input: bcm5974 - report ABS_MT events
  Input: davinci_keyscan - add device_enable method to platform data
  Input: evdev - be less aggressive about sending SIGIO notifies
  Input: atkbd - fix canceling event_work in disconnect
  Input: serio - fix potential deadlock when unbinding drivers
  Input: gf2k - fix &&/|| confusion in gf2k_connect()
parents 9fc81917 c332e9fc

arch/arm/mach-davinci/include/mach/keyscan.h

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ enum davinci_matrix_types { 
};



struct davinci_ks_platform_data {

	int		(*device_enable)(struct device *dev);

	unsigned short	*keymap;

	u32		keymapsize;

	u8		rep:1;

drivers/input/evdev.c

+2 −1
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ static void evdev_pass_event(struct evdev_client *client, 
	client->head &= EVDEV_BUFFER_SIZE - 1;

	spin_unlock(&client->buffer_lock);



	if (event->type == EV_SYN)

		kill_fasync(&client->fasync, SIGIO, POLL_IN);

}

drivers/input/input.c

+71 −15
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/mutex.h>

#include <linux/rcupdate.h>

#include <linux/smp_lock.h>

#include "input-compat.h"



MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>");

MODULE_DESCRIPTION("Input core");
@@ -764,6 +765,40 @@ static int input_attach_handler(struct input_dev *dev, struct input_handler *han 
	return error;

}



#ifdef CONFIG_COMPAT



static int input_bits_to_string(char *buf, int buf_size,

				unsigned long bits, bool skip_empty)

{

	int len = 0;



	if (INPUT_COMPAT_TEST) {

		u32 dword = bits >> 32;

		if (dword || !skip_empty)

			len += snprintf(buf, buf_size, "%x ", dword);



		dword = bits & 0xffffffffUL;

		if (dword || !skip_empty || len)

			len += snprintf(buf + len, max(buf_size - len, 0),

					"%x", dword);

	} else {

		if (bits || !skip_empty)

			len += snprintf(buf, buf_size, "%lx", bits);

	}



	return len;

}



#else /* !CONFIG_COMPAT */



static int input_bits_to_string(char *buf, int buf_size,

				unsigned long bits, bool skip_empty)

{

	return bits || !skip_empty ?

		snprintf(buf, buf_size, "%lx", bits) : 0;

}



#endif



#ifdef CONFIG_PROC_FS
@@ -832,14 +867,25 @@ static void input_seq_print_bitmap(struct seq_file *seq, const char *name, 
				   unsigned long *bitmap, int max)

{

	int i;



	for (i = BITS_TO_LONGS(max) - 1; i > 0; i--)

		if (bitmap[i])

			break;

	bool skip_empty = true;

	char buf[18];



	seq_printf(seq, "B: %s=", name);

	for (; i >= 0; i--)

		seq_printf(seq, "%lx%s", bitmap[i], i > 0 ? " " : "");



	for (i = BITS_TO_LONGS(max) - 1; i >= 0; i--) {

		if (input_bits_to_string(buf, sizeof(buf),

					 bitmap[i], skip_empty)) {

			skip_empty = false;

			seq_printf(seq, "%s%s", buf, i > 0 ? " " : "");

		}

	}



	/*

	 * If no output was produced print a single 0.

	 */

	if (skip_empty)

		seq_puts(seq, "0");



	seq_putc(seq, '\n');

}
@@ -1128,14 +1174,23 @@ static int input_print_bitmap(char *buf, int buf_size, unsigned long *bitmap, 
{

	int i;

	int len = 0;

	bool skip_empty = true;



	for (i = BITS_TO_LONGS(max) - 1; i > 0; i--)

		if (bitmap[i])

			break;

	for (i = BITS_TO_LONGS(max) - 1; i >= 0; i--) {

		len += input_bits_to_string(buf + len, max(buf_size - len, 0),

					    bitmap[i], skip_empty);

		if (len) {

			skip_empty = false;

			if (i > 0)

				len += snprintf(buf + len, max(buf_size - len, 0), " ");

		}

	}



	for (; i >= 0; i--)

		len += snprintf(buf + len, max(buf_size - len, 0),

				"%lx%s", bitmap[i], i > 0 ? " " : "");

	/*

	 * If no output was produced print a single 0.

	 */

	if (len == 0)

		len = snprintf(buf, buf_size, "%d", 0);



	if (add_cr)

		len += snprintf(buf + len, max(buf_size - len, 0), "\n");
@@ -1150,7 +1205,8 @@ static ssize_t input_dev_show_cap_##bm(struct device *dev, \ 
{									\

	struct input_dev *input_dev = to_input_dev(dev);		\

	int len = input_print_bitmap(buf, PAGE_SIZE,			\

				     input_dev->bm##bit, ev##_MAX, 1);	\

				     input_dev->bm##bit, ev##_MAX,	\

				     true);				\

	return min_t(int, len, PAGE_SIZE);				\

}									\

static DEVICE_ATTR(bm, S_IRUGO, input_dev_show_cap_##bm, NULL)
@@ -1214,7 +1270,7 @@ static int input_add_uevent_bm_var(struct kobj_uevent_env *env, 


	len = input_print_bitmap(&env->buf[env->buflen - 1],

				 sizeof(env->buf) - env->buflen,

				 bitmap, max, 0);

				 bitmap, max, false);

	if (len >= (sizeof(env->buf) - env->buflen))

		return -ENOMEM;

drivers/input/joystick/gf2k.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static int gf2k_connect(struct gameport *gameport, struct gameport_driver *drv) 
	}



#ifdef RESET_WORKS

	if ((gf2k->id != (GB(19,2,0) | GB(15,3,2) | GB(12,3,5))) ||

	if ((gf2k->id != (GB(19,2,0) | GB(15,3,2) | GB(12,3,5))) &&

	    (gf2k->id != (GB(31,2,0) | GB(27,3,2) | GB(24,3,5)))) {

		err = -ENODEV;

		goto fail2;

drivers/input/joystick/xpad.c

+2 −2
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ static int xpad_play_effect(struct input_dev *dev, void *data, 
		xpad->odata[6] = 0x00;

		xpad->odata[7] = 0x00;

		xpad->irq_out->transfer_buffer_length = 8;

		usb_submit_urb(xpad->irq_out, GFP_KERNEL);

		usb_submit_urb(xpad->irq_out, GFP_ATOMIC);

	}



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE