diff options
| author | Christophe Ricard <christophe.ricard@gmail.com> | 2015-06-06 14:16:44 +0300 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-07-04 06:02:25 +0300 |
| commit | 070b6c2af543b1ef5b118ad4ad03f89c2ce15e0b (patch) | |
| tree | 8d79631d884262d9098c4dc4b4a2df909870eaf8 /drivers/nfc | |
| parent | 9a7a8972b6e12a0dcea8fba94d8bcc636f6b7a5d (diff) | |
| download | linux-070b6c2af543b1ef5b118ad4ad03f89c2ce15e0b.tar.xz | |
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 <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers/nfc')
| -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 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; } |