aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2007-05-18 09:29:39 +0000
committerFlorian Fainelli <florian@openwrt.org>2007-05-18 09:29:39 +0000
commit2a248a9e38ebc176838f3675e4cf9393fd2ed659 (patch)
tree4846745c7e6a3ef3ddd6b79a80324dd46f45b20d
parent330a1018f68f0639b889d1b1b7c2f40ff4cc8c8d (diff)
downloadupstream-2a248a9e38ebc176838f3675e4cf9393fd2ed659.tar.gz
upstream-2a248a9e38ebc176838f3675e4cf9393fd2ed659.tar.bz2
upstream-2a248a9e38ebc176838f3675e4cf9393fd2ed659.zip
Backport [7224] to the adm5120 flash map driver
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7270 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c b/target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c
index a353926746..a1737d7020 100644
--- a/target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c
+++ b/target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c
@@ -391,10 +391,8 @@ init_mtd_partitions(struct mtd_info *mtd, size_t size)
}
/* find and size rootfs */
- if (find_root(mtd,size,&adm5120_cfe_parts[2])==0) {
- adm5120_cfe_parts[2].size = size - adm5120_cfe_parts[2].offset -
- adm5120_cfe_parts[3].size;
- }
+ find_root(mtd,size,&adm5120_cfe_parts[2]);
+ adm5120_cfe_parts[2].size = size - adm5120_cfe_parts[2].offset - adm5120_cfe_parts[3].size;
return adm5120_cfe_parts;
}