Merge tag 'nfc-fixes-3.13-1' of git://git.kernel.org/pub/scm/linux/ke…

…rnel/git/sameo/nfc-fixes Samuel Ortiz <[email protected]> says: "This is the first NFC fixes pull request for 3.13. It only contains one fix for a regression introduced with commit e29a9e2. Without this fix, we can not establish a p2p link in target mode. Only initiator mode works." Signed-off-by: John W. Linville <[email protected]>
rtvt123 · Jan 8, 2014 · 2eff7c7 · 2eff7c7
2 parents e46316c + d31652a
commit 2eff7c7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);