Merge tag 'topic/core-stuff-2014-06-30' of git://anongit.freedesktop.org/drm-intel...

[karo-tx-linux.git] / drivers / ata / libahci.c

diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index b9861453fc8148612a740418f5fee3088d7b65a1..40ea583d3610067165d3ab1ea2b4d38b8c210a4c 100644 (file)
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -464,6 +464,11 @@ void ahci_save_initial_config(struct device *dev,
                cap |= HOST_CAP_FBS;
        }
 
+       if ((cap & HOST_CAP_FBS) && (hpriv->flags & AHCI_HFLAG_NO_FBS)) {
+               dev_info(dev, "controller can't do FBS, turning off CAP_FBS\n");
+               cap &= ~HOST_CAP_FBS;
+       }
+
        if (force_port_map && port_map != force_port_map) {
                dev_info(dev, "forcing port_map 0x%x -> 0x%x\n",
                         port_map, force_port_map);