summaryrefslogtreecommitdiffstats
path: root/drivers/misc/mei/init.c
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2013-04-11 03:03:29 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-10 18:56:53 -0700
commit59fcd7c63abf0340f551f487264b67ff5f7a0b86 (patch)
treea9ed905d15418c50dc7b92cee1e4b17c4f62dbb3 /drivers/misc/mei/init.c
parente46980a10a76ec3282dd6832c1974b880acd23d3 (diff)
mei: nfc: Initial nfc implementation
NFC ME device is exported through the MEI bus to be consumed by the NFC subsystem. NFC is represented by two mei clients: An info one and the actual NFC one. In order to properly build the ME id we first need to retrieve the firmware information from the info client and then disconnect from it. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/init.c')
-rw-r--r--drivers/misc/mei/init.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index 54b51c05fa4..4e102ad7ebc 100644
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@ -219,6 +219,8 @@ void mei_stop(struct mei_device *dev)
mei_wd_stop(dev);
+ mei_nfc_host_exit();
+
dev->dev_state = MEI_DEV_POWER_DOWN;
mei_reset(dev, 0);