Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszere...

[firefly-linux-kernel-4.4.55.git] / drivers / nfc / st21nfcb / st21nfcb_se.c

diff --git a/drivers/nfc/st21nfcb/st21nfcb_se.c b/drivers/nfc/st21nfcb/st21nfcb_se.c
index d23e8f27c4aaf5baabca40acd9eecd04e072ab66..7c82e9d87a65d718a92b7066e6b06c3b233e5c60 100644 (file)
--- 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);