diff options
| author | Christophe Ricard <christophe.ricard@gmail.com> | 2015-02-03 21:48:08 +0300 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2015-02-04 11:15:18 +0300 |
| commit | fa00e8fed457841cb24219dbe3cfba7d56de6317 (patch) | |
| tree | ce8a4fa1b3719974644294685e5936fe9bead51d /drivers/nfc | |
| parent | 15d4a8da0e440faf589a26346c8287e1ed0abe6c (diff) | |
| download | linux-fa00e8fed457841cb24219dbe3cfba7d56de6317.tar.xz | |
NFC: nci: Move NFCEE discovery logic
NFCEE_DISCOVER_CMD is a specified NCI command used to discover
NFCEE IDs.
Move nci_nfcee_discover() call to nci_discover_se() in order to
guarantee:
- NFCEE_DISCOVER_CMD run when the NCI state machine is initialized
- NFCEE_DISCOVER_CMD is not run in case there is not discover_se
hook defined by a NFC device driver.
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 | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/nfc/st21nfcb/st21nfcb_se.c b/drivers/nfc/st21nfcb/st21nfcb_se.c index d23e8f27c4aa..7c82e9d87a65 100644 --- a/drivers/nfc/st21nfcb/st21nfcb_se.c +++ b/drivers/nfc/st21nfcb/st21nfcb_se.c @@ -499,10 +499,6 @@ static int st21nfcb_hci_network_init(struct nci_dev *ndev) struct nci_conn_info *conn_info; int r, dev_num; - r = nci_nfcee_discover(ndev, NCI_NFCEE_DISCOVERY_ACTION_ENABLE); - if (r != NCI_STATUS_OK) - goto exit; - dest_params = kzalloc(sizeof(struct core_conn_create_dest_spec_params) + sizeof(struct dest_spec_params), GFP_KERNEL); |