Merge tag 'upstream-4.0-rc5' of git://git.infradead.org/linux-ubifs

c6ef8145 · Linus Torvalds <[email protected]> · 2015-03-21 10:36:44 -07:00

Pull UBI fix from Artem Bityutskiy:
 "This fixes a bug introduced during the v4.0 merge window where we
  forgot to put braces where they should be"

* tag 'upstream-4.0-rc5' of git://git.infradead.org/linux-ubifs:
  UBI: fix missing brace control flow

Commit: c6ef814509fedb4ab4b5dc5bdca309d4e7181597
Parents: 60ed380e · b388e6a7

Merge commit. Changes below are compared with the first parent: 60ed380e.

Changes

1 files changed · +2 −1

File	Status	Add	Del	Content
drivers/mtd/ubi/eba.c	modified	+2	−1	View file

drivers/mtd/ubi/eba.c

View file

diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index da4c792..16e34b3 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -425,9 +425,10 @@ retry:
 					ubi_warn(ubi, "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)