Merge remote-tracking branches 'regulator/topic/db8500', 'regulator/topic/gpio',...

[linux-2.6-microblaze.git] / net / nfc / core.c

diff --git a/net/nfc/core.c b/net/nfc/core.c
index 8725291..83b9927 100644 (file)
--- 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);