From 09bae40620b9f35517c8e229e1856bcbb4b7a454 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Wed, 22 Aug 2012 16:28:46 -0700
Subject: [PATCH] --- yaml --- r: 328269 b: refs/heads/master c:
 58637c9b65300cbdf9fb7c037978daadd136be86 h: refs/heads/master i:   328267:
 405b96c29cf01725ad084b83fde45caedb9ec640 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/nfc/pn533.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index fbb343554e20..da9d105b4ac3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 474fee3db16c63bc440bfb93b57f72ecfc4246f0
+refs/heads/master: 58637c9b65300cbdf9fb7c037978daadd136be86
diff --git a/trunk/drivers/nfc/pn533.c b/trunk/drivers/nfc/pn533.c
index 7ceea111439b..d123444404c8 100644
--- a/trunk/drivers/nfc/pn533.c
+++ b/trunk/drivers/nfc/pn533.c
@@ -2394,9 +2394,7 @@ static int pn533_probe(struct usb_interface *interface,
 	INIT_WORK(&dev->mi_work, pn533_wq_mi_recv);
 	INIT_WORK(&dev->tg_work, pn533_wq_tg_get_data);
 	INIT_WORK(&dev->poll_work, pn533_wq_poll);
-	dev->wq = alloc_workqueue("pn533",
-				  WQ_NON_REENTRANT | WQ_UNBOUND | WQ_MEM_RECLAIM,
-				  1);
+	dev->wq = alloc_ordered_workqueue("pn533", 0);
 	if (dev->wq == NULL)
 		goto error;