From b31d5103c33280738188c51e226224dff4401c7b Mon Sep 17 00:00:00 2001 From: Michael Thalmeier Date: Thu, 21 Apr 2016 16:43:53 +0200 Subject: NFC: pn533: handle interrupted commands in pn533_recv_frame When pn533_recv_frame is called from within abort_command context the current dev->cmd is not guaranteed to be set. Additionally on receiving an error status we can omit frame checking and simply schedule the workqueue. Signed-off-by: Michael Thalmeier Signed-off-by: Samuel Ortiz --- drivers/nfc/pn533/pn533.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'drivers/nfc') diff --git a/drivers/nfc/pn533/pn533.c b/drivers/nfc/pn533/pn533.c index 745181ea693b..d9c55830b2b2 100644 --- a/drivers/nfc/pn533/pn533.c +++ b/drivers/nfc/pn533/pn533.c @@ -2016,8 +2016,16 @@ _error: */ void pn533_recv_frame(struct pn533 *dev, struct sk_buff *skb, int status) { + if (!dev->cmd) + goto sched_wq; + dev->cmd->status = status; + if (status != 0) { + dev_dbg(dev->dev, "%s: Error received: %d\n", __func__, status); + goto sched_wq; + } + if (skb == NULL) { pr_err("NULL Frame -> link is dead\n"); goto sched_wq; -- cgit v1.2.3