diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-22 09:26:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-22 09:26:13 -0700 |
| commit | 61fe087059614226978f4d7bb36da26cb2d28f9f (patch) | |
| tree | 95558d4dfa3409bfedcac17f7a899082b37ad334 | |
| parent | 71c4c8b7c3bdeccef4f478c643a9ff382ec07241 (diff) | |
| parent | 3dc948da783e713cd3dc8bbd8f293f8795af8f06 (diff) | |
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
| -rw-r--r-- | drivers/mtd/ubi/gluebi.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/ubi/scan.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/ubi/gluebi.c b/drivers/mtd/ubi/gluebi.c index 95aaac03f938..b5e478fa2661 100644 --- a/drivers/mtd/ubi/gluebi.c +++ b/drivers/mtd/ubi/gluebi.c @@ -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; diff --git a/drivers/mtd/ubi/scan.c b/drivers/mtd/ubi/scan.c index f60895ee0aeb..a423131b6171 100644 --- a/drivers/mtd/ubi/scan.c +++ b/drivers/mtd/ubi/scan.c @@ -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; |