diff options
| author | Tejun Heo <tj@kernel.org> | 2016-05-13 17:20:48 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2016-05-13 17:20:48 -0400 |
| commit | f8d1a93930a754c4ea27238ae1c0fb2356d12e9a (patch) | |
| tree | 4331184b9aa1f0b66ec6b5f103c46e418e27d315 /drivers/ata/libahci.c | |
| parent | 26f588308efc7f1834b7ee0b1dd4f9a904f555a3 (diff) | |
| parent | 535dac4ab5f42e040e8405b31e309a6b6d4eee57 (diff) | |
| download | blackbird-op-linux-f8d1a93930a754c4ea27238ae1c0fb2356d12e9a.tar.gz blackbird-op-linux-f8d1a93930a754c4ea27238ae1c0fb2356d12e9a.zip | |
Merge branch 'for-4.6-fixes' into for-4.7
Diffstat (limited to 'drivers/ata/libahci.c')
| -rw-r--r-- | drivers/ata/libahci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index e13ba72234dc..71b07198e207 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -507,6 +507,7 @@ void ahci_save_initial_config(struct device *dev, struct ahci_host_priv *hpriv) dev_info(dev, "forcing port_map 0x%x -> 0x%x\n", port_map, hpriv->force_port_map); port_map = hpriv->force_port_map; + hpriv->saved_port_map = port_map; } if (hpriv->mask_port_map) { |
