From d29d03aead364c91a004251de92f024e1bd723ac Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Fri, 21 Dec 2012 17:57:11 -0800
Subject: [PATCH] --- yaml --- r: 350262 b: refs/heads/master c:
 7998005bf7a706a1d6bb3cf2e9783b6437e4419d h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/tty/serial/max3100.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7fa2a5d102f4..227995e7dd47 100644
--- 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
index 7ce3197087bb..dd6277eb5a38 100644
--- 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);
 }