diff options
| author | Tom Rini <trini@konsulko.com> | 2019-09-20 10:47:03 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-09-20 10:48:53 -0400 |
| commit | aa8c6294ed32b4fcf7a9a27526c7346325d8c928 (patch) | |
| tree | dd72430a1424d345ca17c2f6277707160dc23ab4 /disk | |
| parent | a9fa70b7b7167487affc5d919e541872c99e814b (diff) | |
| parent | 282ed24fb3ca8ddb37e9fb465452267e6a658233 (diff) | |
Merge branch '2019-09-19-master-imports'
- Coding style corrections in some RTC drivers.
- Small doc updates.
- Regression fix in part_test_dos()
- Regression fix on TI OMAP WDTs.
- Document deadline for CONFIG_DM migration.
- Switch Travis-CI to "xenial" release.
Diffstat (limited to 'disk')
| -rw-r--r-- | disk/part_dos.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/disk/part_dos.c b/disk/part_dos.c index aae9d95906..8ddc13b50c 100644 --- a/disk/part_dos.c +++ b/disk/part_dos.c @@ -93,7 +93,8 @@ static int test_block_type(unsigned char *buffer) static int part_test_dos(struct blk_desc *dev_desc) { #ifndef CONFIG_SPL_BUILD - ALLOC_CACHE_ALIGN_BUFFER(legacy_mbr, mbr, 1); + ALLOC_CACHE_ALIGN_BUFFER(legacy_mbr, mbr, + DIV_ROUND_UP(dev_desc->blksz, sizeof(legacy_mbr))); if (blk_dread(dev_desc, 0, 1, (ulong *)mbr) != 1) return -1; |