From 10f1908de06b0d6dca55b97d2666b311e3fc7372 Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Tue, 30 Apr 2013 23:50:29 +0200
Subject: [PATCH] --- yaml --- r: 376643 b: refs/heads/master c:
 e3a6b14ceda0207c3405c6266e5177a85c0db044 h: refs/heads/master i:   376641:
 d5dc43880ea0dc552fb0ae5f4412b933cf7c3b2e   376639:
 3f766cdb5bc7533726ed41ef1b6f2d11ee62a6b7 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/nfc/microread/mei.c | 2 --
 trunk/drivers/nfc/pn544/mei.c     | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 3f2a464b7263..21acce1db009 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73f3adb9b91efac04e4e7f8379a85400fc57121e
+refs/heads/master: e3a6b14ceda0207c3405c6266e5177a85c0db044
diff --git a/trunk/drivers/nfc/microread/mei.c b/trunk/drivers/nfc/microread/mei.c
index 51d44fb18be9..cdf1bc53b257 100644
--- a/trunk/drivers/nfc/microread/mei.c
+++ b/trunk/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/trunk/drivers/nfc/pn544/mei.c b/trunk/drivers/nfc/pn544/mei.c
index 50cef3a574b5..b5d3d18179eb 100644
--- a/trunk/drivers/nfc/pn544/mei.c
+++ b/trunk/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;