diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2012-05-15 15:57:06 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-06-04 21:34:29 +0200 |
| commit | fe7c580073280c15bb4eb4f82bf20dddc1a68383 (patch) | |
| tree | 0b71c488d1b3cdd87dd5e05ccd0224b496fec2f9 /net/nfc/nci | |
| parent | ab73b751303bc60d7d9fba875c958dedfe14754c (diff) | |
| download | op-kernel-dev-fe7c580073280c15bb4eb4f82bf20dddc1a68383.zip op-kernel-dev-fe7c580073280c15bb4eb4f82bf20dddc1a68383.tar.gz | |
NFC: Add target mode protocols to the polling loop startup routine
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc/nci')
| -rw-r--r-- | net/nfc/nci/core.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c index d560e6f..0f71898 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c @@ -387,7 +387,8 @@ static int nci_dev_down(struct nfc_dev *nfc_dev) return nci_close_device(ndev); } -static int nci_start_poll(struct nfc_dev *nfc_dev, __u32 protocols) +static int nci_start_poll(struct nfc_dev *nfc_dev, + __u32 im_protocols, __u32 tm_protocols) { struct nci_dev *ndev = nfc_get_drvdata(nfc_dev); int rc; @@ -413,11 +414,11 @@ static int nci_start_poll(struct nfc_dev *nfc_dev, __u32 protocols) return -EBUSY; } - rc = nci_request(ndev, nci_rf_discover_req, protocols, + rc = nci_request(ndev, nci_rf_discover_req, im_protocols, msecs_to_jiffies(NCI_RF_DISC_TIMEOUT)); if (!rc) - ndev->poll_prots = protocols; + ndev->poll_prots = im_protocols; return rc; } |
