diff options
author | Stefan Agner <stefan@agner.ch> | 2016-06-02 12:22:30 -0700 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2017-03-15 18:35:46 +0100 |
commit | 440ef98ad687b210dca17e5c5141b24738f04922 (patch) | |
tree | 036c3507db3d4250cff096e825fc90897e485a3c /drivers/ata/libahci.c | |
parent | de1c77640710e1cca36091c8e6d7947bff2397e7 (diff) | |
parent | 648d744eff1aedea4ffe49dfca07aa465669e1f4 (diff) |
Merge tag 'v4.1.24' into toradex_vf_4.1-next
Linux 4.1.24
Diffstat (limited to 'drivers/ata/libahci.c')
-rw-r--r-- | drivers/ata/libahci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index 287c4ba0219f..49840264dd57 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -495,8 +495,8 @@ void ahci_save_initial_config(struct device *dev, struct ahci_host_priv *hpriv) } } - /* fabricate port_map from cap.nr_ports */ - if (!port_map) { + /* fabricate port_map from cap.nr_ports for < AHCI 1.3 */ + if (!port_map && vers < 0x10300) { port_map = (1 << ahci_nr_ports(cap)) - 1; dev_warn(dev, "forcing PORTS_IMPL to 0x%x\n", port_map); |