3.16.37-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Brian Norris <[email protected]> commit b388e6a7a6ba988998ddd83919ae8d3debf1a13d upstream. commit 0e707ae79ba3 ("UBI: do propagate positive error codes up") seems to have produced an unintended change in the control flow here. Completely untested, but it looks obvious. Caught by Coverity, which didn't like the indentation. CID 1271184. Signed-off-by: Brian Norris <[email protected]> Cc: Dan Carpenter <[email protected]> Signed-off-by: Richard Weinberger <[email protected]> Signed-off-by: Ben Hutchings <[email protected]> --- drivers/mtd/ubi/eba.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/mtd/ubi/eba.c +++ b/drivers/mtd/ubi/eba.c @@ -425,9 +425,10 @@ retry: ubi_warn("corrupted VID header at PEB %d, LEB %d:%d", pnum, vol_id, lnum); err = -EBADMSG; - } else + } else { err = -EINVAL; ubi_ro_mode(ubi); + } } goto out_free; } else if (err == UBI_IO_BITFLIPS)
