From: Brian Norris <computersforpeace@gmail.com>
Date: Mon, 23 Feb 2015 21:07:22 +0000 (-0800)
Subject: UBI: fix missing brace control flow
X-Git-Tag: v3.16.37~186
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cc729411973d318ddfe7fc3b5ca477446a2ec948;p=thirdparty%2Fkernel%2Fstable.git

UBI: fix missing brace control flow

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>
---

diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index 7f5cb7f6ab4ed..f88a5da5f32df 100644
--- 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)