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
commit61338e5fe84fe57b26e570b595ac71d0f95f3213 (patch)
tree694a686217438713a59701bce467e393953bb635
parentff111c2511fb093fde422ac8f194bba53f457586 (diff)
downloadupstream-61338e5fe84fe57b26e570b595ac71d0f95f3213.tar.gz
upstream-61338e5fe84fe57b26e570b595ac71d0f95f3213.tar.bz2
upstream-61338e5fe84fe57b26e570b595ac71d0f95f3213.zip
Backport [7224] to the adm5120 flash map driver
SVN-Revision: 7270
-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;
}