Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 335870
b: refs/heads/master
c: 5b412fd
h: refs/heads/master
v: v3
  • Loading branch information
Thierry Escande authored and Samuel Ortiz committed Nov 19, 2012
1 parent 9e8f23a commit 0fba7ec
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 70418e6efcf4f8652cc08e3f2ab8ae35f0948fd9
refs/heads/master: 5b412fd11c918171c98a253d8a3484afa9f69ca5
6 changes: 5 additions & 1 deletion trunk/drivers/nfc/pn533.c
Original file line number Diff line number Diff line change
Expand Up @@ -2077,8 +2077,12 @@ static int pn533_transceive(struct nfc_dev *nfc_dev,
static int pn533_tm_send_complete(struct pn533 *dev, void *arg,
u8 *params, int params_len)
{
struct sk_buff *skb_out = arg;

nfc_dev_dbg(&dev->interface->dev, "%s", __func__);

dev_kfree_skb(skb_out);

if (params_len < 0) {
nfc_dev_err(&dev->interface->dev,
"Error %d when sending data",
Expand Down Expand Up @@ -2116,7 +2120,7 @@ static int pn533_tm_send(struct nfc_dev *nfc_dev, struct sk_buff *skb)

rc = pn533_send_cmd_frame_async(dev, out_frame, dev->in_frame,
dev->in_maxlen, pn533_tm_send_complete,
NULL, GFP_KERNEL);
skb, GFP_KERNEL);
if (rc) {
nfc_dev_err(&dev->interface->dev,
"Error %d when trying to send data", rc);
Expand Down

0 comments on commit 0fba7ec

Please sign in to comment.