diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-09-11 09:04:00 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-09-11 09:04:00 -0400 |
| commit | 34af6ad39abc7c9b0bdaa68d5d90fd590db37173 (patch) | |
| tree | 75949fd8cc15977d08b1ea83556de47407f188f6 /i8042-Also-store-the-aux-firmware-id-in-multi-plexed.patch | |
| parent | 3252fbd882e58c0b3e97d99da5191ddbd97cfab0 (diff) | |
| download | kernel-34af6ad39abc7c9b0bdaa68d5d90fd590db37173.tar.gz kernel-34af6ad39abc7c9b0bdaa68d5d90fd590db37173.tar.xz kernel-34af6ad39abc7c9b0bdaa68d5d90fd590db37173.zip | |
Linux v3.17-rc4-168-g7ec62d421bdf
- Add support for touchpad in Asus X450 and X550 (rhbz 1110011)
Diffstat (limited to 'i8042-Also-store-the-aux-firmware-id-in-multi-plexed.patch')
| -rw-r--r-- | i8042-Also-store-the-aux-firmware-id-in-multi-plexed.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/i8042-Also-store-the-aux-firmware-id-in-multi-plexed.patch b/i8042-Also-store-the-aux-firmware-id-in-multi-plexed.patch new file mode 100644 index 000000000..3cc6114bb --- /dev/null +++ b/i8042-Also-store-the-aux-firmware-id-in-multi-plexed.patch @@ -0,0 +1,32 @@ +From ef15224bce9875f9a5fbc93a2823219df6936a18 Mon Sep 17 00:00:00 2001 +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 + |