From 70f9d89fa4a4ab63fc57ef44b9d2f4a010e4a7f5 Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Tue, 17 Jun 2008 11:47:27 -0400 Subject: [PATCH] --- yaml --- r: 98202 b: refs/heads/master c: 2f6a77d56523c14651236bc401a99b0e2aca2fdd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/serio/i8042.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d655a5bab721..0a4c64644eaf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: efd5184646d5d400fc538d093e9a0bec22a75551 +refs/heads/master: 2f6a77d56523c14651236bc401a99b0e2aca2fdd diff --git a/trunk/drivers/input/serio/i8042.c b/trunk/drivers/input/serio/i8042.c index 592ff55b62d0..170f71ee5772 100644 --- a/trunk/drivers/input/serio/i8042.c +++ b/trunk/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; + } }