summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorChristophe Ricard <christophe.ricard@gmail.com>2015-10-25 22:54:32 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2015-10-26 06:53:16 +0100
commit404b3e585b15d7431a0ffa5cf67090569fad88c1 (patch)
treebe5e0874940cf51634dc45e84f3c870c83555276 /drivers
parentNFC: st21nfca: Keep st21nfca_gates unchanged in load_session (diff)
downloadlinux-404b3e585b15d7431a0ffa5cf67090569fad88c1.tar.xz
linux-404b3e585b15d7431a0ffa5cf67090569fad88c1.zip
NFC: st-nci: initialize gate_count in st_nci_hci_network_init
When initializing ndev->hci_dev->init_data, only gates field was set. gate_count needs to be initialized as well. Cc: stable@vger.kernel.org Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/nfc/st-nci/se.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/nfc/st-nci/se.c b/drivers/nfc/st-nci/se.c
index df2dc544b73a..11e49a50db45 100644
--- a/drivers/nfc/st-nci/se.c
+++ b/drivers/nfc/st-nci/se.c
@@ -536,6 +536,7 @@ static int st_nci_hci_network_init(struct nci_dev *ndev)
if (!conn_info)
goto free_dest_params;
+ ndev->hci_dev->init_data.gate_count = ARRAY_SIZE(st_nci_gates);
memcpy(ndev->hci_dev->init_data.gates, st_nci_gates,
sizeof(st_nci_gates));