From 51c1a02916f8eb09d484b6f34e2e2315fa27947c Mon Sep 17 00:00:00 2001 From: Ilan Elias Date: Tue, 17 Jan 2012 14:11:33 +0200 Subject: [PATCH] --- yaml --- r: 289975 b: refs/heads/master c: ea9917d6f9e355646258b8d08ac69108908618a2 h: refs/heads/master i: 289973: 97fee46c5004cd171a715ee1147d5ef51915d192 289971: 2937e450dfee93b7f84d09f2d27fff30487ec6a8 289967: d01117138f27de5b88ef3bccbaab888e0dec8ffd v: v3 --- [refs] | 2 +- trunk/drivers/nfc/nfcwilink.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3774e8fe59a3..7613d252406e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1195d89b2defd92829ed54938e60312e62dc8747 +refs/heads/master: ea9917d6f9e355646258b8d08ac69108908618a2 diff --git a/trunk/drivers/nfc/nfcwilink.c b/trunk/drivers/nfc/nfcwilink.c index 90af28d611f6..1f74a77d040d 100644 --- a/trunk/drivers/nfc/nfcwilink.c +++ b/trunk/drivers/nfc/nfcwilink.c @@ -489,8 +489,10 @@ static int nfcwilink_send(struct sk_buff *skb) nfc_dev_dbg(&drv->pdev->dev, "send entry, len %d", skb->len); - if (!test_bit(NFCWILINK_RUNNING, &drv->flags)) - return -EBUSY; + if (!test_bit(NFCWILINK_RUNNING, &drv->flags)) { + kfree_skb(skb); + return -EINVAL; + } /* add the ST hdr to the start of the buffer */ hdr.len = cpu_to_le16(skb->len);