From 070b6c2af543b1ef5b118ad4ad03f89c2ce15e0b Mon Sep 17 00:00:00 2001 From: Christophe Ricard Date: Sat, 6 Jun 2015 13:16:44 +0200 Subject: NFC: st21nfcb: remove st21nfcb_nci_i2c_disable [ Upstream commit 4ac82e894825126816d7b7f662743335ce2b015e ] 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 Signed-off-by: Samuel Ortiz Signed-off-by: Sasha Levin --- drivers/nfc/st21nfcb/i2c.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'drivers/nfc') diff --git a/drivers/nfc/st21nfcb/i2c.c b/drivers/nfc/st21nfcb/i2c.c index 000e0e10dc15..157259d5fa26 100644 --- a/drivers/nfc/st21nfcb/i2c.c +++ b/drivers/nfc/st21nfcb/i2c.c @@ -388,9 +388,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; } -- cgit v1.2.3