diff options
author | Christophe Ricard <christophe.ricard@gmail.com> | 2014-11-12 18:30:37 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2014-12-01 20:01:21 -0500 |
commit | e9ef9431a347185a8a6a88b072506047d329e480 (patch) | |
tree | fced674e3c778daf295eb4dea14aeee716e6771e | |
parent | 93bca2bfa4b79b689603b56feeea0ebed2842cbe (diff) |
NFC: nci: Update nci_disable_se to run proprietary commands to disable a secure element
Some NFC controller using NCI protocols may need a proprietary commands
flow to disable a secure element
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r-- | include/net/nfc/nci_core.h | 1 | ||||
-rw-r--r-- | net/nfc/nci/core.c | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/net/nfc/nci_core.h b/include/net/nfc/nci_core.h index db2d12790112..dd97dd7176e5 100644 --- a/include/net/nfc/nci_core.h +++ b/include/net/nfc/nci_core.h | |||
@@ -73,6 +73,7 @@ struct nci_ops { | |||
73 | int (*setup)(struct nci_dev *ndev); | 73 | int (*setup)(struct nci_dev *ndev); |
74 | __u32 (*get_rfprotocol)(struct nci_dev *ndev, __u8 rf_protocol); | 74 | __u32 (*get_rfprotocol)(struct nci_dev *ndev, __u8 rf_protocol); |
75 | int (*discover_se)(struct nci_dev *ndev); | 75 | int (*discover_se)(struct nci_dev *ndev); |
76 | int (*disable_se)(struct nci_dev *ndev, u32 se_idx); | ||
76 | int (*enable_se)(struct nci_dev *ndev, u32 se_idx); | 77 | int (*enable_se)(struct nci_dev *ndev, u32 se_idx); |
77 | }; | 78 | }; |
78 | 79 | ||
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c index 6c36ec6e477c..bcb70a6b17cd 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c | |||
@@ -756,6 +756,11 @@ static int nci_enable_se(struct nfc_dev *nfc_dev, u32 se_idx) | |||
756 | 756 | ||
757 | static int nci_disable_se(struct nfc_dev *nfc_dev, u32 se_idx) | 757 | static int nci_disable_se(struct nfc_dev *nfc_dev, u32 se_idx) |
758 | { | 758 | { |
759 | struct nci_dev *ndev = nfc_get_drvdata(nfc_dev); | ||
760 | |||
761 | if (ndev->ops->disable_se) | ||
762 | return ndev->ops->disable_se(ndev, se_idx); | ||
763 | |||
759 | return 0; | 764 | return 0; |
760 | } | 765 | } |
761 | 766 | ||