Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ab6fc95f609b372a19e18ea689986846ab1ba29c
Commit:     ab6fc95f609b372a19e18ea689986846ab1ba29c
Parent:     360737a982b1ae09e1659e0bb27085c03f02f404
Author:     Jeff Garzik <[EMAIL PROTECTED]>
AuthorDate: Mon Oct 29 10:43:55 2007 -0400
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Mon Oct 29 10:43:55 2007 -0400

    [libata] AHCI: fix newly introduced host-reset bug
    
    The recent fix to host reset introduced a problem, whereby AHCI-enable
    bit would be cleared upon reset, if it was not asserted prior to reset.
    
    Unconditionally enable AHCI-enable bit.
    
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/ata/ahci.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 93bcb2c..c8ab947 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -898,8 +898,10 @@ static int ahci_reset_controller(struct ata_host *host)
         * AHCI-specific, such as HOST_RESET.
         */
        tmp = readl(mmio + HOST_CTL);
-       if (!(tmp & HOST_AHCI_EN))
-               writel(tmp | HOST_AHCI_EN, mmio + HOST_CTL);
+       if (!(tmp & HOST_AHCI_EN)) {
+               tmp |= HOST_AHCI_EN;
+               writel(tmp, mmio + HOST_CTL);
+       }
 
        /* global controller reset */
        if ((tmp & HOST_RESET) == 0) {
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to