From 0a5f35692db996da5b9fc6ef9a28603bab45b3c1 Mon Sep 17 00:00:00 2001 From: Thierry Escande Date: Fri, 5 Oct 2012 11:05:45 +0200 Subject: [PATCH] --- yaml --- r: 340940 b: refs/heads/master c: 5bcf099c17323a8760620511b1b8e415c2783571 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/nfc/core.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 51757f10db8c..2df61863751c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 19cfe5843e86cc95542d9d875c9386e197956d75 +refs/heads/master: 5bcf099c17323a8760620511b1b8e415c2783571 diff --git a/trunk/net/nfc/core.c b/trunk/net/nfc/core.c index 4cb069766ce5..f1c33f233311 100644 --- a/trunk/net/nfc/core.c +++ b/trunk/net/nfc/core.c @@ -181,6 +181,7 @@ int nfc_stop_poll(struct nfc_dev *dev) dev->ops->stop_poll(dev); dev->polling = false; + dev->rf_mode = NFC_RF_NONE; error: device_unlock(&dev->dev); @@ -274,12 +275,14 @@ int nfc_dep_link_down(struct nfc_dev *dev) if (!rc) { dev->dep_link_up = false; dev->active_target = NULL; + dev->rf_mode = NFC_RF_NONE; nfc_llcp_mac_is_down(dev); nfc_genl_dep_link_down_event(dev); } error: device_unlock(&dev->dev); + return rc; } @@ -503,6 +506,7 @@ EXPORT_SYMBOL(nfc_tm_activated); int nfc_tm_deactivated(struct nfc_dev *dev) { dev->dep_link_up = false; + dev->rf_mode = NFC_RF_NONE; return nfc_genl_tm_deactivated(dev); } @@ -782,6 +786,7 @@ struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops, nfc_genl_data_init(&dev->genl_data); + dev->rf_mode = NFC_RF_NONE; /* first generation must not be 0 */ dev->targets_generation = 1;