From: Brian Norris <computersforpeace@gmail.com>
Date: Tue, 22 Jul 2014 02:07:31 +0000 (-0700)
Subject: mtd: nand: denali: set proper error code on timeout
X-Git-Tag: v4.14-rc1~6540^2~38^2~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c115add9d073752d38f6517882dfeafe76fc4458;p=platform%2Fkernel%2Flinux-rpi.git

mtd: nand: denali: set proper error code on timeout

The condition "if (irq_status == 0)" already ensures that one half of
the ternary ?: is dead. I think this should probably actually be a FAIL,
not a PASS.

Caught by Coverity.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: Jamie Iles <jamie@jamieiles.com>
---

diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
index da0fcc2..4885a0f5 100644
--- a/drivers/mtd/nand/denali.c
+++ b/drivers/mtd/nand/denali.c
@@ -1062,9 +1062,7 @@ static int write_page(struct mtd_info *mtd, struct nand_chip *chip,
 		dev_err(denali->dev,
 				"timeout on write_page (type = %d)\n",
 				raw_xfer);
-		denali->status =
-			(irq_status & INTR_STATUS__PROGRAM_FAIL) ?
-			NAND_STATUS_FAIL : PASS;
+		denali->status = NAND_STATUS_FAIL;
 	}
 
 	denali_enable_dma(denali, false);