---

yaml --- r: 351900 b: refs/heads/master c: 16f7541 h: refs/heads/master v: v3
git-mirror · Jan 9, 2013 · db5d431 · db5d431
1 parent 2347ed3
commit db5d431
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c33d2626d651f3f52d6a1e8b612e2830a4ab71f
+refs/heads/master: 16f7541914e8bee0e76c510c4d8bc5ad8a5edf00
diff --git a/trunk/drivers/nfc/pn533.c b/trunk/drivers/nfc/pn533.c
@@ -335,7 +335,6 @@ struct pn533 {
 	struct work_struct mi_work;
 	struct work_struct tg_work;
 	struct timer_list listen_timer;
-	struct pn533_frame *wq_in_frame;
 	int wq_in_error;
 	int cancel_listen;
 
@@ -467,8 +466,6 @@ static void pn533_recv_response(struct urb *urb)
 	struct pn533 *dev = urb->context;
 	struct pn533_frame *in_frame;
 
-	dev->wq_in_frame = NULL;
-
 	switch (urb->status) {
 	case 0:
 		break; /* success */
@@ -508,7 +505,6 @@ static void pn533_recv_response(struct urb *urb)
 	}
 
 	dev->wq_in_error = 0;
-	dev->wq_in_frame = in_frame;
 
 sched_wq:
 	queue_work(dev->wq, &dev->cmd_complete_work);
@@ -565,7 +561,6 @@ static void pn533_recv_ack(struct urb *urb)
 	return;
 
 sched_wq:
-	dev->wq_in_frame = NULL;
 	queue_work(dev->wq, &dev->cmd_complete_work);
 }