summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorHeiko Schocher <hs@denx.de>2014-06-24 09:25:18 +0200
committerArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2014-07-01 09:23:03 +0300
commite9110361a9a4e258b072b14bd44eb78cf11453cb (patch)
tree7b1048a62c3a6c981af59df7b7569bef9fbd28c2 /drivers/mtd
parenta497c3ba1d97fc69c1e78e7b96435ba8c2cb42ee (diff)
downloadop-kernel-dev-e9110361a9a4e258b072b14bd44eb78cf11453cb.zip
op-kernel-dev-e9110361a9a4e258b072b14bd44eb78cf11453cb.tar.gz
UBI: fix the volumes tree sorting criteria
Commig "604b592 UBI: fix rb_tree node comparison in add_map" broke fastmap backward compatibility and older fastmap images cannot be mounted anymore. The reason is that it changes the volumes RB-tree sorting criteria. This patch fixes the problem. Artem: re-write the commit message Signed-off-by: Heiko Schocher <hs@denx.de> Acked-by: Richard Weinberger <richard@nod.at> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/ubi/fastmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
index b04e7d0..72f39da 100644
--- a/drivers/mtd/ubi/fastmap.c
+++ b/drivers/mtd/ubi/fastmap.c
@@ -125,7 +125,7 @@ static struct ubi_ainf_volume *add_vol(struct ubi_attach_info *ai, int vol_id,
parent = *p;
av = rb_entry(parent, struct ubi_ainf_volume, rb);
- if (vol_id < av->vol_id)
+ if (vol_id > av->vol_id)
p = &(*p)->rb_left;
else
p = &(*p)->rb_right;
OpenPOWER on IntegriCloud