mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-10-31 05:54:26 -04:00
1a8218d6e4
This contains the following new bigger changes: * new partition parser which still could lake some features or have bugs * new nand flash driver * using physmap-flash flash driver for parallel flash * some changes to the serial flash driver With these changes OpenWrt starts using more of the mainline flash drivers. SVN-Revision: 35632
21 lines
651 B
Diff
21 lines
651 B
Diff
--- a/drivers/mtd/bcm47xxpart.c
|
|
+++ b/drivers/mtd/bcm47xxpart.c
|
|
@@ -169,11 +169,12 @@ static int bcm47xxpart_parse(struct mtd_
|
|
* Assume that partitions end at the beginning of the one they are
|
|
* followed by.
|
|
*/
|
|
- for (i = 0; i < curr_part - 1; i++)
|
|
- parts[i].size = parts[i + 1].offset - parts[i].offset;
|
|
- if (curr_part > 0)
|
|
- parts[curr_part - 1].size =
|
|
- master->size - parts[curr_part - 1].offset;
|
|
+ for (i = 0; i < curr_part; i++) {
|
|
+ u64 next_part_offset = (i < curr_part - 1) ?
|
|
+ parts[i + 1].offset : master->size;
|
|
+
|
|
+ parts[i].size = next_part_offset - parts[i].offset;
|
|
+ }
|
|
|
|
*pparts = parts;
|
|
return curr_part;
|