diff options
| author | Tom Rini <trini@konsulko.com> | 2021-04-19 17:00:51 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-04-19 22:49:26 -0400 |
| commit | b0f87110f0fba8b8ab7a02f7d8872235a613aa4d (patch) | |
| tree | 5f29b6b71599e45f6612d46c3e2ca38b1aab5299 /drivers/ata/ahci.c | |
| parent | eed05148c261e3b5f00b11a7a14bf0222b80a0ac (diff) | |
| parent | 647d9509a45d13f553bcc42f506bc7ed706c8dad (diff) | |
| download | u-boot-WIP/19Apr2021.tar.gz | |
Merge branch '2021-04-19-assorted-improvements'WIP/19Apr2021
- ARM64 GIC fix, CONFIG_IRQ now moved to Kconfig
- IDE, lz4 fixes
- octeontx cleanups / enhancements
- highbank DM migration
- sysinfo improvements
- psci updates
- Enable use of -fstack-protector
Diffstat (limited to 'drivers/ata/ahci.c')
| -rw-r--r-- | drivers/ata/ahci.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 2ef21ec508..98b288254b 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -1190,6 +1190,9 @@ int ahci_probe_scsi(struct udevice *ahci_dev, ulong base) */ uc_plat->max_id = max_t(unsigned long, uc_priv->n_ports, uc_plat->max_id); + /* If port count is less than max_id, update max_id */ + if (uc_priv->n_ports < uc_plat->max_id) + uc_plat->max_id = uc_priv->n_ports; return 0; } |