NFC: st-nci: Add support for proprietary commands

[firefly-linux-kernel-4.4.55.git] / drivers / nfc / st-nci / core.c

diff --git a/drivers/nfc/st-nci/core.c b/drivers/nfc/st-nci/core.c
index 07bfc0f00050561eb40c8453dcb0f8d942ef220e..73d36dd8345c6ff106e5ea1ca587c688560f2e6c 100644 (file)
--- a/drivers/nfc/st-nci/core.c
+++ b/drivers/nfc/st-nci/core.c
@@ -152,14 +152,23 @@ int st_nci_probe(struct llt_ndlc *ndlc, int phy_headroom,
 
        nci_set_drvdata(ndlc->ndev, info);
 
+       r = st_nci_vendor_cmds_init(ndlc->ndev);
+       if (r) {
+               pr_err("Cannot register proprietary vendor cmds\n");
+               goto err_reg_dev;
+       }
+
        r = nci_register_device(ndlc->ndev);
        if (r) {
                pr_err("Cannot register nfc device to nci core\n");
-               nci_free_device(ndlc->ndev);
-               return r;
+               goto err_reg_dev;
        }
 
        return st_nci_se_init(ndlc->ndev);
+
+err_reg_dev:
+       nci_free_device(ndlc->ndev);
+       return r;
 }
 EXPORT_SYMBOL_GPL(st_nci_probe);