diff options
Diffstat (limited to 'net/nfc')
| -rw-r--r-- | net/nfc/core.c | 2 | ||||
| -rw-r--r-- | net/nfc/hci/llc_shdlc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/nfc/core.c b/net/nfc/core.c index c1903f439aac..ca1e65f4b133 100644 --- a/net/nfc/core.c +++ b/net/nfc/core.c @@ -379,7 +379,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); diff --git a/net/nfc/hci/llc_shdlc.c b/net/nfc/hci/llc_shdlc.c index 719ad0ac40de..401c7e255273 100644 --- a/net/nfc/hci/llc_shdlc.c +++ b/net/nfc/hci/llc_shdlc.c @@ -298,7 +298,7 @@ static void llc_shdlc_rcv_rej(struct llc_shdlc *shdlc, int y_nr) { struct sk_buff *skb; - pr_debug("remote asks retransmition from frame %d\n", y_nr); + pr_debug("remote asks retransmission from frame %d\n", y_nr); if (llc_shdlc_x_lteq_y_lt_z(shdlc->dnr, y_nr, shdlc->ns)) { if (shdlc->t2_active) { |