aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/input/misc/axp20x-pek.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/input/misc/axp20x-pek.c b/drivers/input/misc/axp20x-pek.c
index c0a763a70a00..400869e61a06 100644
--- a/drivers/input/misc/axp20x-pek.c
+++ b/drivers/input/misc/axp20x-pek.c
@@ -272,11 +272,12 @@ static bool axp20x_pek_should_register_input(struct axp20x_pek *axp20x_pek,
272 272
273 /* 273 /*
274 * On Cherry Trail platforms (hrv == 3), do not register the 274 * On Cherry Trail platforms (hrv == 3), do not register the
275 * input device if there is an "INTCFD9" gpio 275 * input device if there is an "INTCFD9" or "ACPI0011" gpio
276 * button ACPI device, as that handles the power button too, 276 * button ACPI device, as that handles the power button too,
277 * and otherwise we end up reporting all presses twice. 277 * and otherwise we end up reporting all presses twice.
278 */ 278 */
279 if (hrv == 3 && acpi_dev_found("INTCFD9")) 279 if (hrv == 3 && (acpi_dev_present("INTCFD9", NULL, -1) ||
280 acpi_dev_present("ACPI0011", NULL, -1)))
280 return false; 281 return false;
281 282
282 } 283 }