summaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorRobert Baldyga <r.baldyga@samsung.com>2015-08-20 17:26:00 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2015-08-20 21:22:34 +0200
commitfdf79bd48876812acf0de58ed7a8bc1b3a3c67d6 (patch)
treef2407ccb7a408e854260d99fe0a93a29a7500b67 /net/nfc
parentNFC: trf7970a: Add NULL check to clear up smatch warning (diff)
downloadlinux-fdf79bd48876812acf0de58ed7a8bc1b3a3c67d6.tar.xz
linux-fdf79bd48876812acf0de58ed7a8bc1b3a3c67d6.zip
NFC: nci: Add post_setup handler
Some drivers require non-standard configuration after NCI_CORE_INIT request, because they need to know ndev->manufact_specific_info or ndev->manufact_id. This patch adds post_setup handler allowing to do such custom configuration. Signed-off-by: Robert Baldyga <r.baldyga@samsung.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc')
-rw-r--r--net/nfc/nci/core.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index 95af2d24d5be..d9045ec172e3 100644
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -388,6 +388,10 @@ static int nci_open_device(struct nci_dev *ndev)
msecs_to_jiffies(NCI_INIT_TIMEOUT));
}
+ if (ndev->ops->post_setup) {
+ rc = ndev->ops->post_setup(ndev);
+ }
+
if (!rc) {
rc = __nci_request(ndev, nci_init_complete_req, 0,
msecs_to_jiffies(NCI_INIT_TIMEOUT));