diff options
| author | Amitkumar Karwar <akarwar@marvell.com> | 2014-01-06 12:58:17 -0800 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2014-01-07 01:32:40 +0100 |
| commit | 86e8586ed5beea15ce7c359f02a1084c2da93bc7 (patch) | |
| tree | f971986461bb5059d0d5ff74234803bb742c9fe2 | |
| parent | 1907299867431fd899ae630a29b08b878ca1e50f (diff) | |
| download | linux-stable-86e8586ed5beea15ce7c359f02a1084c2da93bc7.tar.gz linux-stable-86e8586ed5beea15ce7c359f02a1084c2da93bc7.tar.bz2 linux-stable-86e8586ed5beea15ce7c359f02a1084c2da93bc7.zip | |
NFC: NCI: Add setup handler
Some drivers require special configuration while initializing.
This patch adds setup handler for this custom configuration.
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.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 | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/net/nfc/nci_core.h b/include/net/nfc/nci_core.h index 6126f1f992b4..5c6fadd63483 100644 --- a/include/net/nfc/nci_core.h +++ b/include/net/nfc/nci_core.h @@ -68,6 +68,7 @@ struct nci_ops { int (*open)(struct nci_dev *ndev); int (*close)(struct nci_dev *ndev); int (*send)(struct nci_dev *ndev, struct sk_buff *skb); + int (*setup)(struct nci_dev *ndev); }; #define NCI_MAX_SUPPORTED_RF_INTERFACES 4 diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c index 6fbb7bab46e7..29c1caf3e975 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c @@ -301,6 +301,9 @@ static int nci_open_device(struct nci_dev *ndev) rc = __nci_request(ndev, nci_reset_req, 0, msecs_to_jiffies(NCI_RESET_TIMEOUT)); + if (ndev->ops->setup(ndev)) + ndev->ops->setup(ndev); + if (!rc) { rc = __nci_request(ndev, nci_init_req, 0, msecs_to_jiffies(NCI_INIT_TIMEOUT)); |