Patch "mtd: nand: sunxi: Fix the non-polling case in sunxi_nfc_wait_events()" has been added to the 4.9-stable tree

Patch "mtd: nand: sunxi: Fix the non-polling case in sunxi_nfc_wait_events()" has been added to the 4.9-stable tree

[gregkh]

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

    mtd: nand: sunxi: Fix the non-polling case in sunxi_nfc_wait_events()

to the 4.9-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:
     mtd-nand-sunxi-fix-the-non-polling-case-in-sunxi_nfc_wait_events.patch
and it can be found in the queue-4.9 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 foo@baz Mon Nov  6 10:07:35 CET 2017
From: Boris Brezillon <boris.brezillon@free-electrons.com>
Date: Sat, 7 Oct 2017 22:36:52 +0000
Subject: mtd: nand: sunxi: Fix the non-polling case in sunxi_nfc_wait_events()

From: Boris Brezillon <boris.brezillon@free-electrons.com>


[ Upstream commit 19649e2c16fbc94b664f7074ec4fa9f15292fdce ]

wait_for_completion_timeout() returns 0 if a timeout occurred, 1
otherwise. Fix the sunxi_nfc_wait_events() accordingly.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/mtd/nand/sunxi_nand.c |    4 ++++
 1 file changed, 4 insertions(+)

--- a/drivers/mtd/nand/sunxi_nand.c
+++ b/drivers/mtd/nand/sunxi_nand.c
@@ -320,6 +320,10 @@ static int sunxi_nfc_wait_events(struct
 
 		ret = wait_for_completion_timeout(&nfc->complete,
 						msecs_to_jiffies(timeout_ms));
+		if (!ret)
+			ret = -ETIMEDOUT;
+		else
+			ret = 0;
 
 		writel(0, nfc->regs + NFC_REG_INT);
 	} else {


Patches currently in stable-queue which might be from boris.brezillon@free-electrons.com are

queue-4.9/mtd-nand-sunxi-fix-the-non-polling-case-in-sunxi_nfc_wait_events.patch