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>

authored by Jiri Kosina and committed by Dmitry Torokhov 2f6a77d5 efd51846

+6 -2
+6 -2
drivers/input/serio/i8042.c
··· 952 952 i8042_ctr |= I8042_CTR_AUXDIS | I8042_CTR_KBDDIS; 953 953 i8042_ctr &= ~(I8042_CTR_AUXINT | I8042_CTR_KBDINT); 954 954 if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) { 955 - printk(KERN_ERR "i8042: Can't write CTR to resume\n"); 956 - return -EIO; 955 + printk(KERN_WARNING "i8042: Can't write CTR to resume, retrying...\n"); 956 + msleep(50); 957 + if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) { 958 + printk(KERN_ERR "i8042: CTR write retry failed\n"); 959 + return -EIO; 960 + } 957 961 } 958 962 959 963