diff options
| author | Jiri Kosina | 2008-06-17 17:47:27 +0200 |
|---|---|---|
| committer | Dmitry Torokhov | 2008-06-17 17:47:27 +0200 |
| commit | 2f6a77d56523c14651236bc401a99b0e2aca2fdd (patch) | |
| tree | 3697ee2c0525a6e4455327afcaaa7935c0d4dac0 /drivers/input/serio/i8042.c | |
| parent | Input: i8042 - add Fujitsu-Siemens Amilo Pro V2030 to nomux table (diff) | |
| download | kernel-qcow2-linux-2f6a77d56523c14651236bc401a99b0e2aca2fdd.tar.gz kernel-qcow2-linux-2f6a77d56523c14651236bc401a99b0e2aca2fdd.tar.xz kernel-qcow2-linux-2f6a77d56523c14651236bc401a99b0e2aca2fdd.zip | |
Input: i8042 - retry failed CTR writes when resuming
There are systems that fail in i8042_resume() with
i8042: Can't write CTR to resume
as i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR) fails even though the
controller claimed itself to be ready before.
One retry after failing write fixes the problems on the failing systems.
Reported-by: Helmut Schaa <hschaa@novell.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/serio/i8042.c')
| -rw-r--r-- | drivers/input/serio/i8042.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index 592ff55b62d0..170f71ee5772 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c @@ -952,8 +952,12 @@ static int i8042_resume(struct platform_device *dev) i8042_ctr |= I8042_CTR_AUXDIS | I8042_CTR_KBDDIS; i8042_ctr &= ~(I8042_CTR_AUXINT | I8042_CTR_KBDINT); if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) { - printk(KERN_ERR "i8042: Can't write CTR to resume\n"); - return -EIO; + printk(KERN_WARNING "i8042: Can't write CTR to resume, retrying...\n"); + msleep(50); + if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) { + printk(KERN_ERR "i8042: CTR write retry failed\n"); + return -EIO; + } } |