Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input update from Dmitry Torokhov:
"Updates for the input subsystem. Just a couple of driver fixes this
time."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: gpio_keys - defer probing if GPIO probing is deferred
Input: gpio_keys_polled - defer probing if GPIO probing is deferred
Input: sentelic - only report position of first finger as ST coordinates
+25
-3
+12
-1
drivers/input/keyboard/gpio_keys.c
+12
-1
drivers/input/keyboard/gpio_keys.c
···
602
602
603
603
i = 0;
604
604
for_each_child_of_node(node, pp) {
605
+
int gpio;
605
606
enum of_gpio_flags flags;
606
607
607
608
if (!of_find_property(pp, "gpios", NULL)) {
···
611
610
continue;
612
611
}
613
612
613
+
gpio = of_get_gpio_flags(pp, 0, &flags);
614
+
if (gpio < 0) {
615
+
error = gpio;
616
+
if (error != -EPROBE_DEFER)
617
+
dev_err(dev,
618
+
"Failed to get gpio flags, error: %d\n",
619
+
error);
620
+
goto err_free_pdata;
621
+
}
622
+
614
623
button = &pdata->buttons[i++];
615
624
616
-
button->gpio = of_get_gpio_flags(pp, 0, &flags);
625
+
button->gpio = gpio;
617
626
button->active_low = flags & OF_GPIO_ACTIVE_LOW;
618
627
619
628
if (of_property_read_u32(pp, "linux,code", &button->code)) {
+12
-1
drivers/input/keyboard/gpio_keys_polled.c
+12
-1
drivers/input/keyboard/gpio_keys_polled.c
···
135
135
136
136
i = 0;
137
137
for_each_child_of_node(node, pp) {
138
+
int gpio;
138
139
enum of_gpio_flags flags;
139
140
140
141
if (!of_find_property(pp, "gpios", NULL)) {
···
144
143
continue;
145
144
}
146
145
146
+
gpio = of_get_gpio_flags(pp, 0, &flags);
147
+
if (gpio < 0) {
148
+
error = gpio;
149
+
if (error != -EPROBE_DEFER)
150
+
dev_err(dev,
151
+
"Failed to get gpio flags, error: %d\n",
152
+
error);
153
+
goto err_free_pdata;
154
+
}
155
+
147
156
button = &pdata->buttons[i++];
148
157
149
-
button->gpio = of_get_gpio_flags(pp, 0, &flags);
158
+
button->gpio = gpio;
150
159
button->active_low = flags & OF_GPIO_ACTIVE_LOW;
151
160
152
161
if (of_property_read_u32(pp, "linux,code", &button->code)) {
+1
-1
drivers/input/mouse/sentelic.c
+1
-1
drivers/input/mouse/sentelic.c
···
791
791
fsp_set_slot(dev, 0, fgrs > 0, abs_x, abs_y);
792
792
fsp_set_slot(dev, 1, false, 0, 0);
793
793
}
794
-
if (fgrs > 0) {
794
+
if (fgrs == 1 || (fgrs == 2 && !(packet[0] & FSP_PB0_MFMC_FGR2))) {
795
795
input_report_abs(dev, ABS_X, abs_x);
796
796
input_report_abs(dev, ABS_Y, abs_y);
797
797
}