---

yaml --- r: 350262 b: refs/heads/master c: 7998005 h: refs/heads/master v: v3
git-mirror · Dec 28, 2012 · d29d03a · d29d03a
1 parent cdecc4f
commit d29d03a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d899be584d4b4c5d6b49d655176b25cebf6ff1a
+refs/heads/master: 7998005bf7a706a1d6bb3cf2e9783b6437e4419d
diff --git a/trunk/drivers/tty/serial/max3100.c b/trunk/drivers/tty/serial/max3100.c
@@ -179,8 +179,7 @@ static void max3100_work(struct work_struct *w);
 
 static void max3100_dowork(struct max3100_port *s)
 {
-	if (!s->force_end_work && !work_pending(&s->work) &&
-	    !freezing(current) && !s->suspending)
+	if (!s->force_end_work && !freezing(current) && !s->suspending)
 		queue_work(s->workqueue, &s->work);
 }