ipv4: convert dst_metrics.refcnt from atomic_t to refcount_t

[mirror_ubuntu-artful-kernel.git] / drivers / ata / libahci.c

diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index 9116bba1b07dfa8109a18db9aa4a9f53fbe3df1a..1d3e614bad2b281ebd3bdd420902db81abde57ca 100644 (file)
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -679,10 +679,11 @@ int ahci_stop_engine(struct ata_port *ap)
                        MIDR_CPU_VAR_REV(0, 0),
                        MIDR_CPU_VAR_REV(0, MIDR_REVISION_MASK))) {
                tmp = readl(hpriv->mmio + 0x8000);
+               udelay(100);
                writel(tmp | (1 << 26), hpriv->mmio + 0x8000);
-               udelay(1);
+               udelay(100);
                writel(tmp & ~(1 << 26), hpriv->mmio + 0x8000);
-               dev_warn(ap->host->dev, "CN99XX stop engine fix applied!\n");
+               dev_warn(ap->host->dev, "CN99XX SATA reset workaround applied\n");
        }
 #endif