[3.19.y-ckt stable] Patch "NFC: st21nfcb: remove st21nfcb_nci_i2c_disable" has been added to staging queue

[Kamal Mostafa]

This is a note to let you know that I have just added a patch titled

    NFC: st21nfcb: remove st21nfcb_nci_i2c_disable

to the linux-3.19.y-queue branch of the 3.19.y-ckt extended stable tree 
which can be found at:

    http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.19.y-queue

This patch is scheduled to be released in version 3.19.y-ckt4.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.19.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Kamal

------

>From 22e6dbd8487d88c59cd88b5b62dee0b2b813662b Mon Sep 17 00:00:00 2001
From: Christophe Ricard <christophe.ricard at gmail.com>
Date: Sat, 6 Jun 2015 13:16:44 +0200
Subject: 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 at st.com>
Signed-off-by: Samuel Ortiz <sameo at linux.intel.com>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
 drivers/nfc/st21nfcb/i2c.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/nfc/st21nfcb/i2c.c b/drivers/nfc/st21nfcb/i2c.c
index 84267a6..45b1f39 100644
--- a/drivers/nfc/st21nfcb/i2c.c
+++ b/drivers/nfc/st21nfcb/i2c.c
@@ -358,9 +358,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;
 }

--
1.9.1