From: Boris Brezillon <boris.brezillon@free-electrons.com>
Date: Sat, 7 Oct 2017 22:36:52 +0000 (+0000)
Subject: mtd: nand: sunxi: Fix the non-polling case in sunxi_nfc_wait_events()
X-Git-Tag: C0P2-H0.0--20200415~6916
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=293c98f15d048148a0130da293cc855721dd4fd8;p=linux.git

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


[ 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>
---

diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c
index 8b8470c4e6d0..f9b2a771096b 100644
--- 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 sunxi_nfc *nfc, u32 events,
 
 		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 {