whoops, a bit overzealous in deleting stuff..

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


Commit:     92df55fa9ff1c203a2dd5eb655f4d3001b42b3be
Parent:     54f6d44315ddb22fd05cbf6f3fe00f2e1a53c330
commit 92df55fa9ff1c203a2dd5eb655f4d3001b42b3be
Author:     Andres Salomon <dilinger at debian.org>
AuthorDate: Mon Dec 18 18:23:24 2006 -0500
Commit:     Andres Salomon <dilinger at debian.org>
CommitDate: Mon Dec 18 18:23:24 2006 -0500

    whoops, a bit overzealous in deleting stuff..
---
 drivers/input/mouse/olpc.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/input/mouse/olpc.c b/drivers/input/mouse/olpc.c
index 7d4036c..d249161 100644
--- a/drivers/input/mouse/olpc.c
+++ b/drivers/input/mouse/olpc.c
@@ -346,7 +346,11 @@ static void olpc_switch_mode_0 (void *p)
 	if (ret) {
 		/* 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);
+		return;
 	}
+
+	/* Wait 20ms, then continue. */
+	queue_delayed_work(kpsmoused_wq, &priv->modeswitch_work_1, HZ/10);
 }
 
 static void olpc_switch_mode_1 (void *p)


More information about the Commits-kernel mailing list