summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-01-08 13:36:17 -0500
committerJohn W. Linville <linville@tuxdriver.com>2014-01-08 13:36:17 -0500
commit2eff7c791a18a31a6ede36172258c4e05d632fac (patch)
treeb0f919c616ed6ddf31dfdc817975e87d8d2fa421
parente46316c86ee6a5e8909fa228455f9cf1dbee6957 (diff)
parentd31652a26bc9e752a99b6ac3b61353129934e451 (diff)
downloadlinux-stable-2eff7c791a18a31a6ede36172258c4e05d632fac.tar.gz
linux-stable-2eff7c791a18a31a6ede36172258c4e05d632fac.tar.bz2
linux-stable-2eff7c791a18a31a6ede36172258c4e05d632fac.zip
Merge tag 'nfc-fixes-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-fixes
Samuel Ortiz <sameo@linux.intel.com> says: "This is the first NFC fixes pull request for 3.13. It only contains one fix for a regression introduced with commit e29a9e2ae165620d. Without this fix, we can not establish a p2p link in target mode. Only initiator mode works." Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--net/nfc/core.c2
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);