---

yaml --- r: 119336 b: refs/heads/master c: d6d79a7 h: refs/heads/master v: v3
git-mirror · Nov 11, 2008 · 927571a · 927571a
1 parent c748c6b
commit 927571a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8215b81cc31cf267506bc6a4a4bfe93f4ca1652
+refs/heads/master: d6d79a785d430c0e17f7e2d662f10de022cbca93
diff --git a/trunk/drivers/input/keyboard/atkbd.c b/trunk/drivers/input/keyboard/atkbd.c
@@ -824,7 +824,7 @@ static void atkbd_disconnect(struct serio *serio)
 	atkbd_disable(atkbd);
 
 	/* make sure we don't have a command in flight */
-	flush_scheduled_work();
+	cancel_delayed_work_sync(&atkbd->event_work);
 
 	sysfs_remove_group(&serio->dev.kobj, &atkbd_attribute_group);
 	input_unregister_device(atkbd->dev);