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>
This commit is contained in:
parent
efd5184646
commit
2f6a77d565
|
@ -952,8 +952,12 @@ static int i8042_resume(struct platform_device *dev)
|
||||||
i8042_ctr |= I8042_CTR_AUXDIS | I8042_CTR_KBDDIS;
|
i8042_ctr |= I8042_CTR_AUXDIS | I8042_CTR_KBDDIS;
|
||||||
i8042_ctr &= ~(I8042_CTR_AUXINT | I8042_CTR_KBDINT);
|
i8042_ctr &= ~(I8042_CTR_AUXINT | I8042_CTR_KBDINT);
|
||||||
if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) {
|
if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) {
|
||||||
printk(KERN_ERR "i8042: Can't write CTR to resume\n");
|
printk(KERN_WARNING "i8042: Can't write CTR to resume, retrying...\n");
|
||||||
return -EIO;
|
msleep(50);
|
||||||
|
if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) {
|
||||||
|
printk(KERN_ERR "i8042: CTR write retry failed\n");
|
||||||
|
return -EIO;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue