diff options
| author | Christophe Ricard <christophe.ricard@gmail.com> | 2015-02-03 19:48:07 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2015-02-04 09:14:09 +0100 |
| commit | 15d4a8da0e440faf589a26346c8287e1ed0abe6c (patch) | |
| tree | d6ddf14215118c72dff898f57b24535e68225878 /drivers/nfc | |
| parent | 3ba5c8466b320c3fd5d5861b34aa8a31dd0cf6b3 (diff) | |
| download | op-kernel-dev-15d4a8da0e440faf589a26346c8287e1ed0abe6c.zip op-kernel-dev-15d4a8da0e440faf589a26346c8287e1ed0abe6c.tar.gz | |
NFC: nci: Move logical connection structure allocation
conn_info is currently allocated only after nfcee_discovery_ntf
which is not generic enough for logical connection other than
NFCEE. The corresponding conn_info is now created in
nci_core_conn_create_rsp().
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
| -rw-r--r-- | drivers/nfc/st21nfcb/st21nfcb_se.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nfc/st21nfcb/st21nfcb_se.c b/drivers/nfc/st21nfcb/st21nfcb_se.c index 3b465e4..d23e8f2 100644 --- a/drivers/nfc/st21nfcb/st21nfcb_se.c +++ b/drivers/nfc/st21nfcb/st21nfcb_se.c @@ -513,7 +513,7 @@ static int st21nfcb_hci_network_init(struct nci_dev *ndev) dest_params->type = NCI_DESTINATION_SPECIFIC_PARAM_NFCEE_TYPE; dest_params->length = sizeof(struct dest_spec_params); - spec_params.id = ndev->hci_dev->conn_info->id; + spec_params.id = ndev->hci_dev->nfcee_id; spec_params.protocol = NCI_NFCEE_INTERFACE_HCI_ACCESS; memcpy(dest_params->value, &spec_params, sizeof(struct dest_spec_params)); r = nci_core_conn_create(ndev, NCI_DESTINATION_NFCEE, 1, |
