NFC: Set active target upon DEP up event reception

[karo-tx-linux.git] / net / nfc / core.c

diff --git a/net/nfc/core.c b/net/nfc/core.c
index 269ffc5288d02fcf894e0cac249ec5073bf2f785..872529105abc7c3a2e41b9d579e934e019e8e5ff 100644 (file)
--- a/net/nfc/core.c
+++ b/net/nfc/core.c
@@ -384,6 +384,19 @@ int nfc_dep_link_is_up(struct nfc_dev *dev, u32 target_idx,
 {
        dev->dep_link_up = true;
 
+       if (!dev->active_target) {
+               struct nfc_target *target;
+
+               target = nfc_find_target(dev, target_idx);
+               if (target == NULL)
+                       return -ENOTCONN;
+
+               dev->active_target = target;
+       }
+
+       dev->polling = false;
+       dev->rf_mode = rf_mode;
+
        nfc_llcp_mac_is_up(dev, target_idx, comm_mode, rf_mode);
 
        return nfc_genl_dep_link_up_event(dev, target_idx, comm_mode, rf_mode);