]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
[PATCH] libata: kill SError clearing in sata_std_hardreset().
authorTejun Heo <htejun@gmail.com>
Fri, 10 Feb 2006 14:58:48 +0000 (23:58 +0900)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 10 Feb 2006 15:30:11 +0000 (10:30 -0500)
Don't clear SError in sata_std_hardreset().  This makes hardreset act
identically to ->phy_reset register-wise.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
drivers/scsi/libata-core.c

index 8424bd9ee26d718000c8b5364bbfe1b4344f066b..38e72c1dd68953cca2ac1d95e78ad9a4ceb6ba9f 100644 (file)
@@ -2018,8 +2018,6 @@ int ata_std_softreset(struct ata_port *ap, int verbose, unsigned int *classes)
  */
 int sata_std_hardreset(struct ata_port *ap, int verbose, unsigned int *class)
 {
-       u32 serror;
-
        DPRINTK("ENTER\n");
 
        /* Issue phy wake/reset */
@@ -2034,10 +2032,6 @@ int sata_std_hardreset(struct ata_port *ap, int verbose, unsigned int *class)
        /* Bring phy back */
        sata_phy_resume(ap);
 
-       /* Clear SError */
-       serror = scr_read(ap, SCR_ERROR);
-       scr_write(ap, SCR_ERROR, serror);
-
        /* TODO: phy layer with polling, timeouts, etc. */
        if (!sata_dev_present(ap)) {
                *class = ATA_DEV_NONE;