summaryrefslogtreecommitdiff
path: root/drivers/nfc
diff options
context:
space:
mode:
authorEric Lapuyade <eric.lapuyade@intel.com>2012-05-30 18:13:06 +0200
committerJohn W. Linville <linville@tuxdriver.com>2012-07-09 16:42:12 -0400
commiteae202aa2083eb6f7fdb686e2c42d7db4ef63632 (patch)
tree436b6259204a196d36ae31d78ce2ebfc89d95f3a /drivers/nfc
parent36516268fd372294f5f4f26e0538ee70a1b5b9e7 (diff)
downloadlinux-3.10-eae202aa2083eb6f7fdb686e2c42d7db4ef63632.tar.gz
linux-3.10-eae202aa2083eb6f7fdb686e2c42d7db4ef63632.tar.bz2
linux-3.10-eae202aa2083eb6f7fdb686e2c42d7db4ef63632.zip
NFC: update PN544 HCI driver state when opened/closed
Signed-off-by: Eric Lapuyade <eric.lapuyade@intel.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/pn544_hci.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/nfc/pn544_hci.c b/drivers/nfc/pn544_hci.c
index 457eac35dc7..69df6fecb84 100644
--- a/drivers/nfc/pn544_hci.c
+++ b/drivers/nfc/pn544_hci.c
@@ -377,6 +377,9 @@ static int pn544_hci_open(struct nfc_shdlc *shdlc)
r = pn544_hci_enable(info, HCI_MODE);
+ if (r == 0)
+ info->state = PN544_ST_READY;
+
out:
mutex_unlock(&info->info_lock);
return r;
@@ -393,6 +396,8 @@ static void pn544_hci_close(struct nfc_shdlc *shdlc)
pn544_hci_disable(info);
+ info->state = PN544_ST_COLD;
+
out:
mutex_unlock(&info->info_lock);
}