Commit 87450bd5 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: matrix_keypad - increase the limit of rows and columns
  Input: wacom - fix error path in wacom_probe()
  Input: ads7846 - check proper condition when freeing gpio
  Revert "Input: do not pass injected events back to the originating handler"
  Input: sysrq - rework re-inject logic
  Input: serio - clear pending rescans after sysfs driver rebind
  Input: rotary_encoder - use proper irqflags
  Input: wacom_w8001 - report resolution to userland
parents 055d2194 cfaea567

drivers/input/input.c

+11 −26
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ static int input_defuzz_abs_event(int value, int old_val, int fuzz) 
 * dev->event_lock held and interrupts disabled.

 */

static void input_pass_event(struct input_dev *dev,

			     struct input_handler *src_handler,

			     unsigned int type, unsigned int code, int value)

{

	struct input_handler *handler;
@@ -94,15 +93,6 @@ static void input_pass_event(struct input_dev *dev, 
				continue;



			handler = handle->handler;



			/*

			 * If this is the handler that injected this

			 * particular event we want to skip it to avoid

			 * filters firing again and again.

			 */

			if (handler == src_handler)

				continue;



			if (!handler->filter) {

				if (filtered)

					break;
@@ -132,7 +122,7 @@ static void input_repeat_key(unsigned long data) 
	if (test_bit(dev->repeat_key, dev->key) &&

	    is_event_supported(dev->repeat_key, dev->keybit, KEY_MAX)) {



		input_pass_event(dev, NULL, EV_KEY, dev->repeat_key, 2);

		input_pass_event(dev, EV_KEY, dev->repeat_key, 2);



		if (dev->sync) {

			/*
@@ -141,7 +131,7 @@ static void input_repeat_key(unsigned long data) 
			 * Otherwise assume that the driver will send

			 * SYN_REPORT once it's done.

			 */

			input_pass_event(dev, NULL, EV_SYN, SYN_REPORT, 1);

			input_pass_event(dev, EV_SYN, SYN_REPORT, 1);

		}



		if (dev->rep[REP_PERIOD])
@@ -174,7 +164,6 @@ static void input_stop_autorepeat(struct input_dev *dev) 
#define INPUT_PASS_TO_ALL	(INPUT_PASS_TO_HANDLERS | INPUT_PASS_TO_DEVICE)



static int input_handle_abs_event(struct input_dev *dev,

				  struct input_handler *src_handler,

				  unsigned int code, int *pval)

{

	bool is_mt_event;
@@ -218,15 +207,13 @@ static int input_handle_abs_event(struct input_dev *dev, 
	/* Flush pending "slot" event */

	if (is_mt_event && dev->slot != input_abs_get_val(dev, ABS_MT_SLOT)) {

		input_abs_set_val(dev, ABS_MT_SLOT, dev->slot);

		input_pass_event(dev, src_handler,

				 EV_ABS, ABS_MT_SLOT, dev->slot);

		input_pass_event(dev, EV_ABS, ABS_MT_SLOT, dev->slot);

	}



	return INPUT_PASS_TO_HANDLERS;

}



static void input_handle_event(struct input_dev *dev,

			       struct input_handler *src_handler,

			       unsigned int type, unsigned int code, int value)

{

	int disposition = INPUT_IGNORE_EVENT;
@@ -279,8 +266,7 @@ static void input_handle_event(struct input_dev *dev, 


	case EV_ABS:

		if (is_event_supported(code, dev->absbit, ABS_MAX))

			disposition = input_handle_abs_event(dev, src_handler,

							     code, &value);

			disposition = input_handle_abs_event(dev, code, &value);



		break;
@@ -338,7 +324,7 @@ static void input_handle_event(struct input_dev *dev, 
		dev->event(dev, type, code, value);



	if (disposition & INPUT_PASS_TO_HANDLERS)

		input_pass_event(dev, src_handler, type, code, value);

		input_pass_event(dev, type, code, value);

}



/**
@@ -367,7 +353,7 @@ void input_event(struct input_dev *dev, 


		spin_lock_irqsave(&dev->event_lock, flags);

		add_input_randomness(type, code, value);

		input_handle_event(dev, NULL, type, code, value);

		input_handle_event(dev, type, code, value);

		spin_unlock_irqrestore(&dev->event_lock, flags);

	}

}
@@ -397,8 +383,7 @@ void input_inject_event(struct input_handle *handle, 
		rcu_read_lock();

		grab = rcu_dereference(dev->grab);

		if (!grab || grab == handle)

			input_handle_event(dev, handle->handler,

					   type, code, value);

			input_handle_event(dev, type, code, value);

		rcu_read_unlock();



		spin_unlock_irqrestore(&dev->event_lock, flags);
@@ -611,10 +596,10 @@ static void input_dev_release_keys(struct input_dev *dev) 
		for (code = 0; code <= KEY_MAX; code++) {

			if (is_event_supported(code, dev->keybit, KEY_MAX) &&

			    __test_and_clear_bit(code, dev->key)) {

				input_pass_event(dev, NULL, EV_KEY, code, 0);

				input_pass_event(dev, EV_KEY, code, 0);

			}

		}

		input_pass_event(dev, NULL, EV_SYN, SYN_REPORT, 1);

		input_pass_event(dev, EV_SYN, SYN_REPORT, 1);

	}

}
@@ -889,9 +874,9 @@ int input_set_keycode(struct input_dev *dev, 
	    !is_event_supported(old_keycode, dev->keybit, KEY_MAX) &&

	    __test_and_clear_bit(old_keycode, dev->key)) {



		input_pass_event(dev, NULL, EV_KEY, old_keycode, 0);

		input_pass_event(dev, EV_KEY, old_keycode, 0);

		if (dev->sync)

			input_pass_event(dev, NULL, EV_SYN, SYN_REPORT, 1);

			input_pass_event(dev, EV_SYN, SYN_REPORT, 1);

	}



 out:

drivers/input/misc/rotary_encoder.c

+2 −2
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static int __devinit rotary_encoder_probe(struct platform_device *pdev) 


	/* request the IRQs */

	err = request_irq(encoder->irq_a, &rotary_encoder_irq,

			  IORESOURCE_IRQ_HIGHEDGE | IORESOURCE_IRQ_LOWEDGE,

			  IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,

			  DRV_NAME, encoder);

	if (err) {

		dev_err(&pdev->dev, "unable to request IRQ %d\n",
@@ -185,7 +185,7 @@ static int __devinit rotary_encoder_probe(struct platform_device *pdev) 
	}



	err = request_irq(encoder->irq_b, &rotary_encoder_irq,

			  IORESOURCE_IRQ_HIGHEDGE | IORESOURCE_IRQ_LOWEDGE,

			  IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,

			  DRV_NAME, encoder);

	if (err) {

		dev_err(&pdev->dev, "unable to request IRQ %d\n",

drivers/input/serio/serio.c

+7 −4
Original line number Diff line number Diff line
@@ -188,7 +188,8 @@ static void serio_free_event(struct serio_event *event) 
	kfree(event);

}



static void serio_remove_duplicate_events(struct serio_event *event)

static void serio_remove_duplicate_events(void *object,

					  enum serio_event_type type)

{

	struct serio_event *e, *next;

	unsigned long flags;
@@ -196,13 +197,13 @@ static void serio_remove_duplicate_events(struct serio_event *event) 
	spin_lock_irqsave(&serio_event_lock, flags);



	list_for_each_entry_safe(e, next, &serio_event_list, node) {

		if (event->object == e->object) {

		if (object == e->object) {

			/*

			 * If this event is of different type we should not

			 * look further - we only suppress duplicate events

			 * that were sent back-to-back.

			 */

			if (event->type != e->type)

			if (type != e->type)

				break;



			list_del_init(&e->node);
@@ -245,7 +246,7 @@ static void serio_handle_event(struct work_struct *work) 
			break;

		}



		serio_remove_duplicate_events(event);

		serio_remove_duplicate_events(event->object, event->type);

		serio_free_event(event);

	}
@@ -436,10 +437,12 @@ static ssize_t serio_rebind_driver(struct device *dev, struct device_attribute * 
	} else if (!strncmp(buf, "rescan", count)) {

		serio_disconnect_port(serio);

		serio_find_driver(serio);

		serio_remove_duplicate_events(serio, SERIO_RESCAN_PORT);

	} else if ((drv = driver_find(buf, &serio_bus)) != NULL) {

		serio_disconnect_port(serio);

		error = serio_bind_driver(serio, to_serio_driver(drv));

		put_driver(drv);

		serio_remove_duplicate_events(serio, SERIO_RESCAN_PORT);

	} else {

		error = -EINVAL;

	}

drivers/input/tablet/wacom_sys.c

+1 −1
Original line number Diff line number Diff line
@@ -519,7 +519,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i 
	/* Retrieve the physical and logical size for OEM devices */

	error = wacom_retrieve_hid_descriptor(intf, features);

	if (error)

		goto fail2;

		goto fail3;



	wacom_setup_device_quirks(features);

drivers/input/touchscreen/ads7846.c

+22 −16
Original line number Diff line number Diff line
@@ -941,19 +941,15 @@ static int __devinit ads7846_setup_pendown(struct spi_device *spi, struct ads784 
	struct ads7846_platform_data *pdata = spi->dev.platform_data;

	int err;



	/* REVISIT when the irq can be triggered active-low, or if for some

	/*

	 * REVISIT when the irq can be triggered active-low, or if for some

	 * reason the touchscreen isn't hooked up, we don't need to access

	 * the pendown state.

	 */

	if (!pdata->get_pendown_state && !gpio_is_valid(pdata->gpio_pendown)) {

		dev_err(&spi->dev, "no get_pendown_state nor gpio_pendown?\n");

		return -EINVAL;

	}



	if (pdata->get_pendown_state) {

		ts->get_pendown_state = pdata->get_pendown_state;

		return 0;

	}

	} else if (gpio_is_valid(pdata->gpio_pendown)) {



		err = gpio_request(pdata->gpio_pendown, "ads7846_pendown");

		if (err) {
@@ -964,6 +960,11 @@ static int __devinit ads7846_setup_pendown(struct spi_device *spi, struct ads784 


		ts->gpio_pendown = pdata->gpio_pendown;



	} else {

		dev_err(&spi->dev, "no get_pendown_state nor gpio_pendown?\n");

		return -EINVAL;

	}



	return 0;

}
@@ -1353,7 +1354,7 @@ static int __devinit ads7846_probe(struct spi_device *spi) 
 err_put_regulator:

	regulator_put(ts->reg);

 err_free_gpio:

	if (ts->gpio_pendown != -1)

	if (!ts->get_pendown_state)

		gpio_free(ts->gpio_pendown);

 err_cleanup_filter:

	if (ts->filter_cleanup)
@@ -1383,8 +1384,13 @@ static int __devexit ads7846_remove(struct spi_device *spi) 
	regulator_disable(ts->reg);

	regulator_put(ts->reg);



	if (ts->gpio_pendown != -1)

	if (!ts->get_pendown_state) {

		/*

		 * If we are not using specialized pendown method we must

		 * have been relying on gpio we set up ourselves.

		 */

		gpio_free(ts->gpio_pendown);

	}



	if (ts->filter_cleanup)

		ts->filter_cleanup(ts->filter_data);

CRA Git | Maintained and supported by SUSTech CRA and CCSE