diff options
| author | Arron Wang <arron.wang@intel.com> | 2013-11-14 17:03:41 +0800 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2014-01-04 03:31:32 +0100 |
| commit | d31652a26bc9e752a99b6ac3b61353129934e451 (patch) | |
| tree | 7f5c115d57ea99951413eb2894b9b50ff485d0de /net/nfc | |
| parent | b7e047358449f8eb5cba8197b42280b676b82e54 (diff) | |
| download | linux-d31652a26bc9e752a99b6ac3b61353129934e451.tar.gz linux-d31652a26bc9e752a99b6ac3b61353129934e451.tar.bz2 linux-d31652a26bc9e752a99b6ac3b61353129934e451.zip | |
NFC: Fix target mode p2p link establishment
With commit e29a9e2ae165620d, we set the active_target pointer from
nfc_dep_link_is_up() in order to support the case where the target
detection and the DEP link setting are done atomically by the driver.
That can only happen in initiator mode, so we need to check for that
otherwise we fail to bring a p2p link in target mode.
Signed-off-by: Arron Wang <arron.wang@intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc')
| -rw-r--r-- | net/nfc/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/nfc/core.c b/net/nfc/core.c index 872529105abc..83b9927e7d19 100644 --- a/net/nfc/core.c +++ b/net/nfc/core.c @@ -384,7 +384,7 @@ int nfc_dep_link_is_up(struct nfc_dev *dev, u32 target_idx, { dev->dep_link_up = true; - if (!dev->active_target) { + if (!dev->active_target && rf_mode == NFC_RF_INITIATOR) { struct nfc_target *target; target = nfc_find_target(dev, target_idx); |