Patch "NFC: st21nfcb: remove st21nfcb_nci_i2c_disable" has been added to the 4.1-stable tree

Patch "NFC: st21nfcb: remove st21nfcb_nci_i2c_disable" has been added to the 4.1-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    NFC: st21nfcb: remove st21nfcb_nci_i2c_disable

to the 4.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     nfc-st21nfcb-remove-st21nfcb_nci_i2c_disable.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 4ac82e894825126816d7b7f662743335ce2b015e Mon Sep 17 00:00:00 2001
From: Christophe Ricard <christophe.ricard@gmail.com>
Date: Sat, 6 Jun 2015 13:16:44 +0200
Subject: NFC: st21nfcb: remove st21nfcb_nci_i2c_disable

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;
 }
 


Patches currently in stable-queue which might be from christophe.ricard@gmail.com are

queue-4.1/nfc-st21nfcb-remove-st21nfcb_nci_i2c_disable.patch
queue-4.1/nfc-st21nfcb-do-not-remove-header-once-the-payload-is-sent.patch