projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 73f3adb)
NFC: mei: Do not disable MEI devices from their remove routine
authorSamuel Ortiz <sameo@linux.intel.com>
Tue, 30 Apr 2013 21:50:29 +0000 (23:50 +0200)
committerSamuel Ortiz <sameo@linux.intel.com>
Tue, 21 May 2013 08:48:41 +0000 (10:48 +0200)
Enabling and disabling device is exclusively handled by the mei_phy_ops.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
drivers/nfc/microread/mei.c patch | blob | blame | history
drivers/nfc/pn544/mei.c patch | blob | blame | history

diff --git a/drivers/nfc/microread/mei.c b/drivers/nfc/microread/mei.c
index 51d44fb18be96214fe4f5d0b916880915df1ff57..cdf1bc53b257f6ae34e3f2148de97b47f53521b7 100644 (file)
--- 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 50cef3a574b51f0fb299e7436a5b4f8910ed0e79..b5d3d18179eb1da92d35700a8f06fd91ad6a7666 100644 (file)
--- 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;