NFC: st21nfca: Fix recursive fault when doing p2p in target mode.

This patch fix a previous patch introduce by commit	0a91e8ac240a12ac3a03581deb8cd531788c63d4

It is actually fixing a double free mistake in all st21nfca_tm_* function.
We decide to return directly in case of successful execution because skb
got already freed. In st21nfca_tm_recv_dep_req it got freed by nfc_tm_data_received.

Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/drivers/nfc/st21nfca/st21nfca.c b/drivers/nfc/st21nfca/st21nfca.c
index e5f92aaa546643abeab53c567b618514cdcf1d36..a89e56c2c74954a0ac248bb00f603cd0528af3c4 100644 (file)
--- a/drivers/nfc/st21nfca/st21nfca.c
+++ b/drivers/nfc/st21nfca/st21nfca.c
@@ -861,19 +861,16 @@ static int st21nfca_hci_event_received(struct nfc_hci_dev *hdev, u8 gate,
                if (gate == ST21NFCA_RF_CARD_F_GATE) {
                        r = st21nfca_tm_event_send_data(hdev, skb, gate);
                        if (r < 0)
-                               goto exit;
-               } else {
-                       info->dep_info.curr_nfc_dep_pni = 0;
-                       return 1;
+                               return r;
+                       return 0;
                }
-               break;
+               info->dep_info.curr_nfc_dep_pni = 0;
+               return 1;
        default:
                return 1;
        }
        kfree_skb(skb);
        return 0;
-exit:
-       return r;
 }
 
 static struct nfc_hci_ops st21nfca_hci_ops = {