---

yaml --- r: 376643 b: refs/heads/master c: e3a6b14 h: refs/heads/master i: 376641: d5dc438 376639: 3f766cd v: v3
git-mirror · May 21, 2013 · 10f1908 · 10f1908
1 parent 98672a3
commit 10f1908
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git 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
@@ -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
@@ -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;