diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-09-16 09:07:16 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-09-16 09:07:16 -0400 |
| commit | cf23086f03db3db081d5bfab14d6d92e2d67c289 (patch) | |
| tree | dc1d979cdd8ac2217dcf760960933094e36de569 /i8042-Also-store-the-aux-firmware-id-in-multi-plexed.patch | |
| parent | 7094b06a730e849d19d2e0ad57ee49566e790c8d (diff) | |
| download | kernel-cf23086f03db3db081d5bfab14d6d92e2d67c289.tar.gz kernel-cf23086f03db3db081d5bfab14d6d92e2d67c289.tar.xz kernel-cf23086f03db3db081d5bfab14d6d92e2d67c289.zip | |
Linux v3.17-rc5-13-g2324067fa9a4
- Reenable debugging options.
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, 0 insertions, 32 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 deleted file mode 100644 index 1fec3e7b3..000000000 --- a/i8042-Also-store-the-aux-firmware-id-in-multi-plexed.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3764b4c8c3944854fd1742548723d4cb9949b993 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 - |