iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFC: pn533: i2c: do not call pn533_recv_frame with aborted commands

Browse Source 
When a command gets aborted the pn533 core does not need any RX
frames that may be received until a new frame is sent.

Signed-off-by: Michael Thalmeier <michael.thalmeier@hale.at>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Michael Thalmeier 2016-04-21 16:43:51 +02:00 committed by Samuel Ortiz
parent b16931b13c
commit 30f98489f5
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/nfc/pn533/i2c.c
View File

@ -39,6 +39,8 @@ struct pn533_i2c_phy {
struct i2c_client *i2c_dev; struct i2c_client *i2c_dev;
struct pn533 *priv; struct pn533 *priv;
bool aborted;
int hard_fault; /* int hard_fault; /*
* < 0 if hardware error occurred (e.g. i2c err) * < 0 if hardware error occurred (e.g. i2c err)
* and prevents normal operation. * and prevents normal operation.
@ -71,6 +73,8 @@ static int pn533_i2c_send_frame(struct pn533 *dev,
if (phy->priv == NULL) if (phy->priv == NULL)
phy->priv = dev; phy->priv = dev;
phy->aborted = false;
print_hex_dump_debug("PN533_i2c TX: ", DUMP_PREFIX_NONE, 16, 1, print_hex_dump_debug("PN533_i2c TX: ", DUMP_PREFIX_NONE, 16, 1,
out->data, out->len, false); out->data, out->len, false);
@ -93,13 +97,15 @@ static int pn533_i2c_send_frame(struct pn533 *dev,
static void pn533_i2c_abort_cmd(struct pn533 *dev, gfp_t flags) static void pn533_i2c_abort_cmd(struct pn533 *dev, gfp_t flags)
{ {
struct pn533_i2c_phy *phy = dev->phy;
phy->aborted = true;
/* An ack will cancel the last issued command */ /* An ack will cancel the last issued command */
pn533_i2c_send_ack(dev, flags); pn533_i2c_send_ack(dev, flags);
/* schedule cmd_complete_work to finish current command execution */ /* schedule cmd_complete_work to finish current command execution */
if (dev->cmd != NULL) pn533_recv_frame(phy->priv, NULL, -ENOENT);
dev->cmd->status = -ENOENT;
queue_work(dev->wq, &dev->cmd_complete_work);
} }
static int pn533_i2c_read(struct pn533_i2c_phy *phy, struct sk_buff **skb) static int pn533_i2c_read(struct pn533_i2c_phy *phy, struct sk_buff **skb)
@ -164,7 +170,8 @@ static irqreturn_t pn533_i2c_irq_thread_fn(int irq, void *data)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
pn533_recv_frame(phy->priv, skb, 0); if (!phy->aborted)
pn533_recv_frame(phy->priv, skb, 0);
return IRQ_HANDLED; return IRQ_HANDLED;
} }