diff options
| author | Tom Rini <trini@konsulko.com> | 2023-04-07 10:44:19 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-04-07 10:44:19 -0400 |
| commit | 340bebf9c799793affefd166875d5776744988bd (patch) | |
| tree | 193a646521cf659f333c5e1c11745116259b0477 /drivers/ata/ahci.c | |
| parent | b0b77fdf3d7d2c1a5e48c3971a677f14e372c164 (diff) | |
| parent | a554ee7edee8e10b38c6899ad8556daf58ca3afe (diff) | |
Merge branch '2023-04-06-assorted-updates'
- Make use of the semi-formal "fallthrough" mechanism, update env tools
to use /run for lockfile, add 2048 game (as a way to test console
changes), update some CONFIG option logic in Kconfig, have lmb command
show regions in use, remove some duplicate serial code, add
__gnu_thumb1_case_si code and fix m68k custodian email address.
Diffstat (limited to 'drivers/ata/ahci.c')
| -rw-r--r-- | drivers/ata/ahci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 272c48b8e5..6998b82aa5 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -211,8 +211,8 @@ static int ahci_host_init(struct ahci_uc_priv *uc_priv) uc_priv->cap, uc_priv->port_map, uc_priv->n_ports); #if !defined(CONFIG_DM_SCSI) - if (uc_priv->n_ports > CONFIG_SYS_SCSI_MAX_SCSI_ID) - uc_priv->n_ports = CONFIG_SYS_SCSI_MAX_SCSI_ID; + if (uc_priv->n_ports > CONFIG_SYS_SATA_MAX_PORTS) + uc_priv->n_ports = CONFIG_SYS_SATA_MAX_PORTS; #endif for (i = 0; i < uc_priv->n_ports; i++) { |