From: Brian Norris <computersforpeace@gmail.com>
Date: Mon, 4 May 2015 18:43:31 +0000 (-0700)
Subject: mtd: readtest: don't clobber error reports
X-Git-Tag: v4.1-rc4~2^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=db7c727402b3f6a604f0c52be5f6df8ca3797030;p=karo-tx-linux.git

mtd: readtest: don't clobber error reports

Commit 2a6a28e7922c ("mtd: Make MTD tests cancelable") accidentally
clobbered any read failure reports.

Coverity CID #1296020

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
---

diff --git a/drivers/mtd/tests/readtest.c b/drivers/mtd/tests/readtest.c
index a3196b750a22..58df07acdbdb 100644
--- a/drivers/mtd/tests/readtest.c
+++ b/drivers/mtd/tests/readtest.c
@@ -191,9 +191,11 @@ static int __init mtd_readtest_init(void)
 				err = ret;
 		}
 
-		err = mtdtest_relax();
-		if (err)
+		ret = mtdtest_relax();
+		if (ret) {
+			err = ret;
 			goto out;
+		}
 	}
 
 	if (err)