History

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

Linus Torvalds committed 11 years ago

Commit c6ef8142 parents 60ed380 b388e6a1 file · +2 −1Browse files

Unified · Split

drivers/mtd/ubi/eba.c+2−1
@@ -425,9 +425,10 @@ retry: · 424 unmodified lines
425425 ubi_warn(ubi, "corrupted VID header at PEB %d, LEB %d:%d",
426426 pnum, vol_id, lnum);
427427 err = -EBADMSG;
428− } else
428+ } else {
429429 err = -EINVAL;
430430 ubi_ro_mode(ubi);
431+ }
431432 }
432433 goto out_free;
433434 } else if (err == UBI_IO_BITFLIPS)