diff options
| author | Laura Abbott <labbott@fedoraproject.org> | 2015-09-01 15:03:08 -0700 |
|---|---|---|
| committer | Laura Abbott <labbott@fedoraproject.org> | 2015-09-01 15:59:56 -0700 |
| commit | d07b889185195409a6090ed3e12fff475b4258f4 (patch) | |
| tree | c2b98784a9c45c2ba5420c4a256c03d1c1c2e125 /disable-i8042-check-on-apple-mac.patch | |
| parent | 07775e21b6d0c7b9c2251deb8cb5ef3052a38c6e (diff) | |
| download | kernel-d07b889185195409a6090ed3e12fff475b4258f4.tar.gz kernel-d07b889185195409a6090ed3e12fff475b4258f4.tar.xz kernel-d07b889185195409a6090ed3e12fff475b4258f4.zip | |
Linux v4.2
This is a squashed patch of the history from F22 + the 4.2 rebase
Diffstat (limited to 'disable-i8042-check-on-apple-mac.patch')
| -rw-r--r-- | disable-i8042-check-on-apple-mac.patch | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/disable-i8042-check-on-apple-mac.patch b/disable-i8042-check-on-apple-mac.patch index f99d0f900..40cdb7df3 100644 --- a/disable-i8042-check-on-apple-mac.patch +++ b/disable-i8042-check-on-apple-mac.patch @@ -1,7 +1,6 @@ -From 2a79554c864ac58fa2ad982f0fcee2cc2aa33eb5 Mon Sep 17 00:00:00 2001 From: Bastien Nocera <hadess@hadess.net> Date: Thu, 20 May 2010 10:30:31 -0400 -Subject: Disable i8042 checks on Intel Apple Macs +Subject: [PATCH] disable i8042 check on apple mac As those computers never had any i8042 controllers, and the current lookup code could potentially lock up/hang/wait for @@ -9,16 +8,19 @@ timeout for long periods of time. Fixes intermittent hangs on boot on a MacbookAir1,1 +Bugzilla: N/A +Upstream-status: http://lkml.indiana.edu/hypermail/linux/kernel/1005.0/00938.html (and pinged on Dec 17, 2013) + Signed-off-by: Bastien Nocera <hadess@hadess.net> --- - drivers/input/serio/i8042.c | 22 ++++++++++++++++++++++ - 1 files changed, 22 insertions(+), 0 deletions(-) + drivers/input/serio/i8042.c | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c -index 6440a8f..4d7cf98 100644 +index bfb0b2280df0..06b10fe7e65b 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c -@@ -1451,6 +1451,22 @@ static struct platform_driver i8042_driver = { +@@ -1484,6 +1484,22 @@ static struct platform_driver i8042_driver = { .shutdown = i8042_shutdown, }; @@ -41,7 +43,7 @@ index 6440a8f..4d7cf98 100644 static int __init i8042_init(void) { struct platform_device *pdev; -@@ -1458,6 +1474,12 @@ static int __init i8042_init(void) +@@ -1491,6 +1507,12 @@ static int __init i8042_init(void) dbg_init(); @@ -54,6 +56,3 @@ index 6440a8f..4d7cf98 100644 err = i8042_platform_init(); if (err) return err; --- -1.7.0.1 - |