Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74c7b2af 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 

Pull input updates from Dmitry Torokhov:
 "Just small driver fixups"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: colibri-vf50-ts - add missing #include <linux/of.h>
  Input: adp5589 - fix row 5 handling for adp5589
  Input: edt-ft5x06 - fix setting gain, offset, and threshold via device tree
  Input: vmmouse - fix absolute device registration
  Input: serio - drop warnings in case of EPROBE_DEFER from serio_find_driver()
  Input: cap11xx - add missing of_node_put
  Input: sirfsoc-onkey - allow modular build
  Input: xpad - remove unused function
parents 4e541699 ff84dabe

drivers/input/joystick/xpad.c

+0 −1
Original line number Diff line number Diff line
@@ -1207,7 +1207,6 @@ static void xpad_led_disconnect(struct usb_xpad *xpad) 
#else

static int xpad_led_probe(struct usb_xpad *xpad) { return 0; }

static void xpad_led_disconnect(struct usb_xpad *xpad) { }

static void xpad_identify_controller(struct usb_xpad *xpad) { }

#endif



static int xpad_start_input(struct usb_xpad *xpad)

drivers/input/keyboard/adp5589-keys.c

+4 −3
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ struct adp5589_kpad { 
	unsigned short gpimapsize;

	unsigned extend_cfg;

	bool is_adp5585;

	bool adp5585_support_row5;

	bool support_row5;

#ifdef CONFIG_GPIOLIB

	unsigned char gpiomap[ADP5589_MAXGPIO];

	bool export_gpio;
@@ -485,7 +485,7 @@ static int adp5589_build_gpiomap(struct adp5589_kpad *kpad, 
	if (kpad->extend_cfg & C4_EXTEND_CFG)

		pin_used[kpad->var->c4_extend_cfg] = true;



	if (!kpad->adp5585_support_row5)

	if (!kpad->support_row5)

		pin_used[5] = true;



	for (i = 0; i < kpad->var->maxgpio; i++)
@@ -884,12 +884,13 @@ static int adp5589_probe(struct i2c_client *client, 


	switch (id->driver_data) {

	case ADP5585_02:

		kpad->adp5585_support_row5 = true;

		kpad->support_row5 = true;

	case ADP5585_01:

		kpad->is_adp5585 = true;

		kpad->var = &const_adp5585;

		break;

	case ADP5589:

		kpad->support_row5 = true;

		kpad->var = &const_adp5589;

		break;

	}

drivers/input/keyboard/cap11xx.c

+6 −2
Original line number Diff line number Diff line
@@ -304,8 +304,10 @@ static int cap11xx_init_leds(struct device *dev, 
		led->cdev.brightness = LED_OFF;



		error = of_property_read_u32(child, "reg", &reg);

		if (error != 0 || reg >= num_leds)

		if (error != 0 || reg >= num_leds) {

			of_node_put(child);

			return -EINVAL;

		}



		led->reg = reg;

		led->priv = priv;
@@ -313,8 +315,10 @@ static int cap11xx_init_leds(struct device *dev, 
		INIT_WORK(&led->work, cap11xx_led_work);



		error = devm_led_classdev_register(dev, &led->cdev);

		if (error)

		if (error) {

			of_node_put(child);

			return error;

		}



		priv->num_leds++;

		led++;

drivers/input/misc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -733,7 +733,7 @@ config INPUT_XEN_KBDDEV_FRONTEND 
	  module will be called xen-kbdfront.



config INPUT_SIRFSOC_ONKEY

	bool "CSR SiRFSoC power on/off/suspend key support"

	tristate "CSR SiRFSoC power on/off/suspend key support"

	depends on ARCH_SIRF && OF

	default y

	help

drivers/input/misc/sirfsoc-onkey.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static void sirfsoc_pwrc_close(struct input_dev *input) 
static const struct of_device_id sirfsoc_pwrc_of_match[] = {

	{ .compatible = "sirf,prima2-pwrc" },

	{},

}

};

MODULE_DEVICE_TABLE(of, sirfsoc_pwrc_of_match);



static int sirfsoc_pwrc_probe(struct platform_device *pdev)