mtd: readtest: don't clobber error reports

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=db7c727402b3f6a604f0c52be5f6df8ca3797030
Commit:     db7c727402b3f6a604f0c52be5f6df8ca3797030
Parent:     b787f68c36d49bb1d9236f403813641efa74a031
Author:     Brian Norris <computersforpeace at gmail.com>
AuthorDate: Mon May 4 11:43:31 2015 -0700
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Thu May 14 09:56:31 2015 -0700

    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 at gmail.com>
---
 drivers/mtd/tests/readtest.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/tests/readtest.c b/drivers/mtd/tests/readtest.c
index a3196b7..58df07a 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)