aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2013-04-30 23:50:29 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2013-05-21 10:48:41 +0200
commite3a6b14ceda0207c3405c6266e5177a85c0db044 (patch)
treeb084691065908513b0695d0d404edd11d9357f63
parent73f3adb9b91efac04e4e7f8379a85400fc57121e (diff)
downloadlinux-linaro-stable-e3a6b14ceda0207c3405c6266e5177a85c0db044.tar.gz
NFC: mei: Do not disable MEI devices from their remove routine
Enabling and disabling device is exclusively handled by the mei_phy_ops. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/nfc/microread/mei.c2
-rw-r--r--drivers/nfc/pn544/mei.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/nfc/microread/mei.c b/drivers/nfc/microread/mei.c
index 51d44fb18be9..cdf1bc53b257 100644
--- a/drivers/nfc/microread/mei.c
+++ b/drivers/nfc/microread/mei.c
@@ -63,8 +63,6 @@ static int microread_mei_remove(struct mei_cl_device *device)
microread_remove(phy->hdev);
- nfc_mei_phy_disable(phy);
-
nfc_mei_phy_free(phy);
return 0;
diff --git a/drivers/nfc/pn544/mei.c b/drivers/nfc/pn544/mei.c
index 50cef3a574b5..b5d3d18179eb 100644
--- a/drivers/nfc/pn544/mei.c
+++ b/drivers/nfc/pn544/mei.c
@@ -63,8 +63,6 @@ static int pn544_mei_remove(struct mei_cl_device *device)
pn544_hci_remove(phy->hdev);
- nfc_mei_phy_disable(phy);
-
nfc_mei_phy_free(phy);
return 0;