diff options
| author | Ilan Elias <ilane@ti.com> | 2011-09-22 10:13:01 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-09-27 20:34:04 +0200 |
| commit | de054799b7ffee8ce1e3971a8dcd7816ccf04977 (patch) | |
| tree | 897861c1135c73629c2bbb317583bef487c2bc74 /net/nfc | |
| parent | NFC: improve readability of an 'if' in nci core.c (diff) | |
| download | linux-de054799b7ffee8ce1e3971a8dcd7816ccf04977.tar.xz linux-de054799b7ffee8ce1e3971a8dcd7816ccf04977.zip | |
NFC: implicitly deactivate in nci_start_poll
When start_poll is called, and a target was implicitly activated,
we need to implicitly deactivate it.
On the other hand, when the target was activated by the user,
we should not deactivate it.
Signed-off-by: Ilan Elias <ilane@ti.com>
Acked-by: Lauro Ramos Venancio <lauro.venancio@openbossa.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/nfc')
| -rw-r--r-- | net/nfc/nci/core.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c index c3dfd4e13bd5..9f17e8ec0ab9 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c @@ -361,8 +361,13 @@ static int nci_start_poll(struct nfc_dev *nfc_dev, __u32 protocols) return -EBUSY; } + if (ndev->target_active_prot) { + nfc_err("there is an active target"); + return -EBUSY; + } + if (test_bit(NCI_POLL_ACTIVE, &ndev->flags)) { - nfc_dbg("target already active, first deactivate..."); + nfc_dbg("target is active, implicitly deactivate..."); rc = nci_request(ndev, nci_rf_deactivate_req, 0, msecs_to_jiffies(NCI_RF_DEACTIVATE_TIMEOUT)); |