diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-31 14:20:55 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-31 14:20:55 -0400 |
| commit | 08c41ca1efe4d720f242fe7c7a931e5c5857716e (patch) | |
| tree | 2134d2a868d954a7acaf54b12fbbc1366450f97f /drivers | |
| parent | 3fe483b13ec96aacfeb6fa9b7c2a5dc8bb38a866 (diff) | |
| parent | b9ad74d9011ef13dbed3ed43b858dc2ef63faf82 (diff) | |
| download | u-boot-08c41ca1efe4d720f242fe7c7a931e5c5857716e.tar.gz | |
Merge branch '2019-07-31-ti-imports'
- Various DaVinci fixes
- Migrate am335x_boneblack_vboot to use more DM drivers
- Keystone updates
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/nand/raw/davinci_nand.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c index 33c2f16be8..724bbee752 100644 --- a/drivers/mtd/nand/raw/davinci_nand.c +++ b/drivers/mtd/nand/raw/davinci_nand.c @@ -739,8 +739,8 @@ static void davinci_nand_init(struct nand_chip *nand) layout = &nand_keystone_rbl_4bit_layout_oobfirst; layout->oobavail = 0; - for (i = 0; layout->oobfree[i].length && - i < ARRAY_SIZE(layout->oobfree); i++) + for (i = 0; i < ARRAY_SIZE(layout->oobfree) && + layout->oobfree[i].length; i++) layout->oobavail += layout->oobfree[i].length; nand->write_page = nand_davinci_write_page; |