NFC: st21nfca: Keep st21nfca_gates unchanged in load_session

We need to keep initial st_nci_gates values in order for
nfc_hci_dev_connect_gates to create and open pipe when necessary.

For example after a firmware update CLF pipes are cleared. Changing
pipe values in st21nfca_gates was causing nfc_hci_dev_connect_gates
not using accurate pipes value.

Cc: stable@vger.kernel.org
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/core.c b/drivers/nfc/st21nfca/core.c
index 819a94af3964afd6e816e84c2b80690a1fe8f27f..b4451f83d000dc4c62dd29bf7102793b342cf274 100644 (file)
--- a/drivers/nfc/st21nfca/core.c
+++ b/drivers/nfc/st21nfca/core.c
@@ -190,14 +190,14 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
                if (j < ARRAY_SIZE(st21nfca_gates) &&
                        st21nfca_gates[j].gate == info->dst_gate_id &&
                        ST21NFCA_DM_IS_PIPE_OPEN(info->pipe_state)) {
-                       st21nfca_gates[j].pipe = pipe_info[2];
+                       hdev->init_data.gates[j].pipe = pipe_info[2];
 
                        hdev->gate2pipe[st21nfca_gates[j].gate] =
-                                                       st21nfca_gates[j].pipe;
-                       hdev->pipes[st21nfca_gates[j].pipe].gate =
-                                                       st21nfca_gates[j].gate;
-                       hdev->pipes[st21nfca_gates[j].pipe].dest_host =
-                                                       info->src_host_id;
+                                               pipe_info[2];
+                       hdev->pipes[pipe_info[2]].gate =
+                                               st21nfca_gates[j].gate;
+                       hdev->pipes[pipe_info[2]].dest_host =
+                                               info->src_host_id;
                }
                kfree_skb(skb_pipe_info);
        }