---

yaml --- r: 289975 b: refs/heads/master c: ea9917d h: refs/heads/master i: 289973: 97fee46 289971: 2937e45 289967: d011171 v: v3
git-mirror · Jan 24, 2012 · 51c1a02 · 51c1a02
1 parent e47a948
commit 51c1a02
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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);