Commit 55b80c40 authored Sep 28, 2013 by Richard Genoud Committed by Artem Bityutskiy Oct 03, 2013

UBI: simplify image sequence test



The test:
if (!a && b)
  a = b;
can be symplified in:
if (!a)
  a = b;

And there's no need to test if ubi->image_seq is not null, because if it is,
it is set to image_seq.
So, we just test if image_seq is not null.

Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

parent c22301ad

drivers/mtd/ubi/attach.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -900,10 +900,9 @@ static int scan_peb(struct ubi_device ubi, struct ubi_attach_info ai,
		* number.
		*/
		image_seq = be32_to_cpu(ech->image_seq);
		if (!ubi->image_seq && image_seq)
		if (!ubi->image_seq)
		ubi->image_seq = image_seq;
		if (ubi->image_seq && image_seq &&
		ubi->image_seq != image_seq) {
		if (image_seq && ubi->image_seq != image_seq) {
		ubi_err("bad image sequence number %d in PEB %d, expected %d",
		image_seq, pnum, ubi->image_seq);
		ubi_dump_ec_hdr(ech);

Admin message