From: Christophe Ricard Date: Sat, 6 Jun 2015 11:16:44 +0000 (+0200) Subject: NFC: st21nfcb: remove st21nfcb_nci_i2c_disable X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4ac82e894825126816d7b7f662743335ce2b015e;p=linux-beck.git 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 Signed-off-by: Samuel Ortiz --- diff --git a/drivers/nfc/st21nfcb/i2c.c b/drivers/nfc/st21nfcb/i2c.c index 4bc15ec29b03..c44f8cf5391a 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; }