diff options
| author | Tom Rini <trini@konsulko.com> | 2021-09-27 07:41:03 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-09-27 07:41:03 -0400 |
| commit | 78c16a969f70e0b50cf6a73848082787445f49f5 (patch) | |
| tree | 4673d9f09439eb6b228d337162c01e0eb86196c8 /board | |
| parent | 76ad0246834e2c57974b3a472fdc7c5584964caa (diff) | |
| parent | ccee8ea1dd90f0ccb31ed9662e064eaa814e6254 (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- turris_omnia: fix leaked mtd device (Marek)
- phy: marvell: cp110: Fix SATA invert polarity (Denis)
Diffstat (limited to 'board')
| -rw-r--r-- | board/CZ.NIC/turris_omnia/turris_omnia.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c index bac78af04e0..a48e1f5c305 100644 --- a/board/CZ.NIC/turris_omnia/turris_omnia.c +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c @@ -647,10 +647,13 @@ int ft_board_setup(void *blob, struct bd_info *bd) if (!fixup_mtd_partitions(blob, node, mtd)) goto fail; + put_mtd_device(mtd); return 0; fail: printf("Failed fixing SPI NOR partitions!\n"); + if (!IS_ERR_OR_NULL(mtd)) + put_mtd_device(mtd); return 0; } #endif |