summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-03-21 10:36:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-03-21 10:36:44 -0700
commitc6ef814509fedb4ab4b5dc5bdca309d4e7181597 (patch)
tree292f0683b18526b60aeb4c3b94784d1f587a055d /drivers
parent60ed380eb84d8be64c1ec0f91f619536457d084e (diff)
parentb388e6a7a6ba988998ddd83919ae8d3debf1a13d (diff)
downloadlinux-c6ef814509fedb4ab4b5dc5bdca309d4e7181597.tar.bz2
Merge tag 'upstream-4.0-rc5' of git://git.infradead.org/linux-ubifs
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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/ubi/eba.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index da4c79259f67..16e34b37d134 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)