fix build error

Andres Salomon dilinger at debian.unroutableorg
Wed Jan 3 03:36:24 EST 2007


Commit:     54f6d44315ddb22fd05cbf6f3fe00f2e1a53c330
Parent:     38e939c7cc5599d14c5b24219c4719f5e69d2469
commit 54f6d44315ddb22fd05cbf6f3fe00f2e1a53c330
Author:     Andres Salomon <dilinger at debian.org>
AuthorDate: Mon Dec 18 16:20:21 2006 -0500
Commit:     Andres Salomon <dilinger at debian.org>
CommitDate: Mon Dec 18 16:20:21 2006 -0500

    fix build error
    
    don't bother attempting to recover from a failed command for now..
---
 drivers/input/mouse/olpc.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/drivers/input/mouse/olpc.c b/drivers/input/mouse/olpc.c
index 489df03..7d4036c 100644
--- a/drivers/input/mouse/olpc.c
+++ b/drivers/input/mouse/olpc.c
@@ -344,10 +344,7 @@ static void olpc_switch_mode_0 (void *p)
 
 	ret = ps2_command(ps2dev, NULL, 0xF5);
 	if (ret) {
-		/* Wait 100ms, then continue. */
-		queue_delayed_work(kpsmoused_wq, &priv->modeswitch_work_1, msecs_to_jiffies(100));
-			return;
-		}
+		/* XXX: if this ever fails, we need to do a full reset! */
 		printk(KERN_WARNING __FILE__ ": Disable failed for switch to %d. (%d) [%lu]\n", pending_mode, ret, jiffies);
 	}
 }


More information about the Commits-kernel mailing list