diff options
| author | Tom Rini <trini@konsulko.com> | 2021-12-18 22:39:21 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-12-18 22:39:21 +0300 |
| commit | d3213c26b56e564207515f1e28e663718e015dc3 (patch) | |
| tree | f480ec7ab357d7cb94b35eae97174a56305fb866 /disk | |
| parent | c03942ddc9e88d86d919504299905e4e8b0003cd (diff) | |
| parent | 3cfc042d43f5c5cec4bcf0133202bdd8516df66c (diff) | |
| download | u-boot-d3213c26b56e564207515f1e28e663718e015dc3.tar.xz | |
Merge tag 'efi-2022-01-rc4-3' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2022-01-rc4-3
Documentation:
* add Calxeda Highbank/Midway board documentation
Bug fixes:
* call part_init() in blk_get_device_by_str() only for MMC
* fix an 'undefined' error in some driver model macros
Diffstat (limited to 'disk')
| -rw-r--r-- | disk/part.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/disk/part.c b/disk/part.c index e857a9f958..99f592d96c 100644 --- a/disk/part.c +++ b/disk/part.c @@ -430,7 +430,8 @@ int blk_get_device_by_str(const char *ifname, const char *dev_hwpart_str, * Always should be done, otherwise hw partition 0 will return stale * data after displaying a non-zero hw partition. */ - part_init(*dev_desc); + if ((*dev_desc)->if_type == IF_TYPE_MMC) + part_init(*dev_desc); #endif cleanup: |