summaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorChristophe Ricard <christophe.ricard@gmail.com>2014-11-13 00:30:36 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2014-12-02 02:01:21 +0100
commit93bca2bfa4b79b689603b56feeea0ebed2842cbe (patch)
treed0479cb079628f90d563d039b7e4ea253e3a479b /net/nfc
parentba4db551bb48943bcebdacc30219d35a1248de11 (diff)
downloadlinux-stable-93bca2bfa4b79b689603b56feeea0ebed2842cbe.tar.gz
linux-stable-93bca2bfa4b79b689603b56feeea0ebed2842cbe.tar.bz2
linux-stable-93bca2bfa4b79b689603b56feeea0ebed2842cbe.zip
NFC: nci: Update nci_enable_se to run proprietary commands to enable a secure element
Some NFC controller using NCI protocols may need a proprietary commands flow to enable a secure element Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc')
-rw-r--r--net/nfc/nci/core.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index 4044973084a7..6c36ec6e477c 100644
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -746,6 +746,11 @@ static int nci_tm_send(struct nfc_dev *nfc_dev, struct sk_buff *skb)
static int nci_enable_se(struct nfc_dev *nfc_dev, u32 se_idx)
{
+ struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);
+
+ if (ndev->ops->enable_se)
+ return ndev->ops->enable_se(ndev, se_idx);
+
return 0;
}