diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-18 10:01:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-18 10:01:54 -0700 |
| commit | 7cf7d424c309457b21318b05963ff3fd723d5bcd (patch) | |
| tree | f24ae5b0bc01978761b285ae546f2076ca705747 /drivers/mtd/tests/readtest.c | |
| parent | c0655fe9b0901a968800f56687be3c62b4cce5d2 (diff) | |
| parent | 8947e396a8296c5297928b60043f35dfa56baa05 (diff) | |
| download | op-kernel-dev-7cf7d424c309457b21318b05963ff3fd723d5bcd.zip op-kernel-dev-7cf7d424c309457b21318b05963ff3fd723d5bcd.tar.gz | |
Merge tag 'for-linus-20150516' of git://git.infradead.org/linux-mtd
Pull MTD fixes from Brian Norris:
"Two MTD fixes for 4.1:
- readtest: the signal-handling code was clobbering the error codes
we should be handling/reporting in this test, rendering it useless.
Noticed by Coverity.
- the common SPI NOR flash DT binding (merged for 4.1-rc1) is being
revised, so let's change that before 4.1 is minted"
* tag 'for-linus-20150516' of git://git.infradead.org/linux-mtd:
Documentation: dt: mtd: replace "nor-jedec" binding with "jedec, spi-nor"
mtd: readtest: don't clobber error reports
Diffstat (limited to 'drivers/mtd/tests/readtest.c')
| -rw-r--r-- | drivers/mtd/tests/readtest.c | 6 |
1 files 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) |
