Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[~andy/linux] / net / nfc / core.c

diff --git a/net/nfc/core.c b/net/nfc/core.c
index 02ab34132157066d9a0def95276b7abe3f8d7f71..b675fa4a6f19078ff4f3ce3d42a15227334cf247 100644 (file)
--- a/net/nfc/core.c
+++ b/net/nfc/core.c
@@ -382,7 +382,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);