projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
09f39a9
)
NFC: st21nfcb: remove st21nfcb_nci_i2c_disable
author
Christophe Ricard
<christophe.ricard@gmail.com>
Sat, 6 Jun 2015 11:16:44 +0000
(13:16 +0200)
committer
Samuel Ortiz
<sameo@linux.intel.com>
Mon, 8 Jun 2015 22:34:23 +0000
(
00:34
+0200)
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>
drivers/nfc/st21nfcb/i2c.c
patch
|
blob
|
history
diff --git
a/drivers/nfc/st21nfcb/i2c.c
b/drivers/nfc/st21nfcb/i2c.c
index 4bc15ec29b03a854a87fab06a2f5566d36e4475e..c44f8cf5391a67e5c405d3e3d844a2e6373c5eea 100644
(file)
--- 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;
}