diff options
| author | Christophe Ricard <christophe.ricard@gmail.com> | 2015-06-06 13:16:44 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-03 09:29:01 -0700 |
| commit | 0268313777f9ff4c61adfee1b726dbde2f68ed44 (patch) | |
| tree | a32a79aa7f3e93bcd7c5a36d6f0bc0e85fa1e38b | |
| parent | fff9252c7de221c9dc0c9b7e49815e1ebb15f0aa (diff) | |
NFC: st21nfcb: remove st21nfcb_nci_i2c_disable
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>
| -rw-r--r-- | drivers/nfc/st21nfcb/i2c.c | 3 |
1 files changed, 0 insertions, 3 deletions
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; } |