summaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorArron Wang <arron.wang@intel.com>2013-07-30 14:40:05 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2013-08-14 01:13:40 +0200
commit39525ee1dc78ca1f5f2fb1f764f7a141005fe440 (patch)
tree4b2c5948e3d0699f30921e6144361b405c5df68c /net/nfc
parent2c3832834b95e0226da1d13229472978f78462c5 (diff)
downloadlinux-stable-39525ee1dc78ca1f5f2fb1f764f7a141005fe440.tar.gz
linux-stable-39525ee1dc78ca1f5f2fb1f764f7a141005fe440.tar.bz2
linux-stable-39525ee1dc78ca1f5f2fb1f764f7a141005fe440.zip
NFC: Update secure element state
The secure element state was not updated from the enable/disable ops, leaving the SE state to disabled for ever. Signed-off-by: Arron Wang <arron.wang@intel.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc')
-rw-r--r--net/nfc/core.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/nfc/core.c b/net/nfc/core.c
index ee1fe66e2c8a..e92923cf3e03 100644
--- a/net/nfc/core.c
+++ b/net/nfc/core.c
@@ -589,6 +589,8 @@ int nfc_enable_se(struct nfc_dev *dev, u32 se_idx)
}
rc = dev->ops->enable_se(dev, se_idx);
+ if (rc >= 0)
+ se->state = NFC_SE_ENABLED;
error:
device_unlock(&dev->dev);
@@ -632,6 +634,8 @@ int nfc_disable_se(struct nfc_dev *dev, u32 se_idx)
}
rc = dev->ops->disable_se(dev, se_idx);
+ if (rc >= 0)
+ se->state = NFC_SE_DISABLED;
error:
device_unlock(&dev->dev);