]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
UBI: fix missing brace control flow
authorBrian Norris <computersforpeace@gmail.com>
Mon, 23 Feb 2015 21:07:22 +0000 (13:07 -0800)
committerBen Hutchings <ben@decadent.org.uk>
Mon, 22 Aug 2016 21:38:04 +0000 (22:38 +0100)
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 <computersforpeace@gmail.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/mtd/ubi/eba.c

index 7f5cb7f6ab4ed60d3d0ea722320eea63c6e17c23..f88a5da5f32df024feb55b246c6c86812157c906 100644 (file)
@@ -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)