summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Ricard <christophe.ricard@gmail.com>2015-06-06 13:16:44 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2015-06-09 00:34:23 +0200
commit4ac82e894825126816d7b7f662743335ce2b015e (patch)
treeb814e27daf23fd5cac2afa7e2e90985b28a8b826
parent09f39a950523b1bb830c30a8670b77e0067da092 (diff)
downloadop-kernel-dev-4ac82e894825126816d7b7f662743335ce2b015e.zip
op-kernel-dev-4ac82e894825126816d7b7f662743335ce2b015e.tar.gz
NFC: st21nfcb: remove st21nfcb_nci_i2c_disable
ndlc_remove already calls st21nfcb_nci_i2c_disable and phy->powered is already set to 0. Cc: stable@vger.kernel.org Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/nfc/st21nfcb/i2c.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/nfc/st21nfcb/i2c.c b/drivers/nfc/st21nfcb/i2c.c
index 4bc15ec..c44f8cf 100644
--- a/drivers/nfc/st21nfcb/i2c.c
+++ b/drivers/nfc/st21nfcb/i2c.c
@@ -359,9 +359,6 @@ static int st21nfcb_nci_i2c_remove(struct i2c_client *client)
ndlc_remove(phy->ndlc);
- if (phy->powered)
- st21nfcb_nci_i2c_disable(phy);
-
return 0;
}
OpenPOWER on IntegriCloud