Commit 61fe0870 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6 

* 'linux-next' of git://git.infradead.org/ubi-2.6:
  UBI: fix bug in image sequence number handling
  UBI: gluebi: initialize ubi_num field
parents 71c4c8b7 3dc948da

drivers/mtd/ubi/gluebi.c

+1 −0
Original line number Diff line number Diff line
@@ -332,6 +332,7 @@ static int gluebi_create(struct ubi_device_info *di, 
	}



	gluebi->vol_id = vi->vol_id;

	gluebi->ubi_num = vi->ubi_num;

	mtd->type = MTD_UBIVOLUME;

	if (!di->ro_mode)

		mtd->flags = MTD_WRITEABLE;

drivers/mtd/ubi/scan.c

+1 −1
Original line number Diff line number Diff line
@@ -781,7 +781,7 @@ static int process_eb(struct ubi_device *ubi, struct ubi_scan_info *si, 
			return -EINVAL;

		}



		image_seq = be32_to_cpu(ech->ec);

		image_seq = be32_to_cpu(ech->image_seq);

		if (!si->image_seq_set) {

			ubi->image_seq = image_seq;

			si->image_seq_set = 1;