| From | Greg Kroah-Hartman <> | Subject | [PATCH 4.1 045/267] NFC: st21nfcb: remove st21nfcb_nci_i2c_disable | Date | Fri, 31 Jul 2015 12:38:16 -0700 |
| |
4.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe Ricard <christophe.ricard@gmail.com>
commit 4ac82e894825126816d7b7f662743335ce2b015e upstream.
ndlc_remove already calls st21nfcb_nci_i2c_disable and phy->powered is already set to 0.
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- drivers/nfc/st21nfcb/i2c.c | 3 --- 1 file changed, 3 deletions(-)
--- a/drivers/nfc/st21nfcb/i2c.c +++ b/drivers/nfc/st21nfcb/i2c.c @@ -359,9 +359,6 @@ static int st21nfcb_nci_i2c_remove(struc ndlc_remove(phy->ndlc); - if (phy->powered) - st21nfcb_nci_i2c_disable(phy); - return 0; }
|