2014-09-12 17:26:54 +00:00
|
|
|
From 6fd77b0f76b946fd6de55c0a1acff4eee191e5ed Mon Sep 17 00:00:00 2001
|
2014-09-11 13:04:00 +00:00
|
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
|
|
|
Date: Wed, 30 Jul 2014 17:56:05 +0200
|
|
|
|
|
Subject: [PATCH] i8042: Also store the aux firmware id in multi-plexed aux
|
|
|
|
|
ports
|
|
|
|
|
|
|
|
|
|
So that firmware-id matching can be used with multiplexed aux ports too.
|
|
|
|
|
|
|
|
|
|
Bugzilla: 1110011
|
|
|
|
|
Upstream-status: sent for 3.17/3.18
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
|
|
---
|
|
|
|
|
drivers/input/serio/i8042.c | 2 ++
|
|
|
|
|
1 file changed, 2 insertions(+)
|
|
|
|
|
|
|
|
|
|
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
|
|
|
|
|
index f1aeb0240d6e..4b5015f27f9e 100644
|
|
|
|
|
--- a/drivers/input/serio/i8042.c
|
|
|
|
|
+++ b/drivers/input/serio/i8042.c
|
|
|
|
|
@@ -1253,6 +1253,8 @@ static int __init i8042_create_aux_port(int idx)
|
|
|
|
|
} else {
|
|
|
|
|
snprintf(serio->name, sizeof(serio->name), "i8042 AUX%d port", idx);
|
|
|
|
|
snprintf(serio->phys, sizeof(serio->phys), I8042_MUX_PHYS_DESC, idx + 1);
|
|
|
|
|
+ strlcpy(serio->firmware_id, i8042_aux_firmware_id,
|
|
|
|
|
+ sizeof(serio->firmware_id));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
port->serio = serio;
|
|
|
|
|
--
|
|
|
|
|
1.9.3
|
|
|
|
|
|
