aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2006-02-10 09:58:48 -0500
committerJeff Garzik <jgarzik@pobox.com>2006-02-10 10:30:11 -0500
commitac7c6d596e2177857ffc35b8d453ee313a874d8d (patch)
tree81e7d6ad33b5f25a82250351e2e199bcf9023628 /drivers
parent3a39746a5290445ea4238f21ac260e42106c1454 (diff)
[PATCH] libata: kill SError clearing in sata_std_hardreset().
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/libata-core.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 8424bd9ee26d..38e72c1dd689 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -2018,8 +2018,6 @@ int ata_std_softreset(struct ata_port *ap, int verbose, unsigned int *classes)
2018 */ 2018 */
2019int sata_std_hardreset(struct ata_port *ap, int verbose, unsigned int *class) 2019int sata_std_hardreset(struct ata_port *ap, int verbose, unsigned int *class)
2020{ 2020{
2021 u32 serror;
2022
2023 DPRINTK("ENTER\n"); 2021 DPRINTK("ENTER\n");
2024 2022
2025 /* Issue phy wake/reset */ 2023 /* Issue phy wake/reset */
@@ -2034,10 +2032,6 @@ int sata_std_hardreset(struct ata_port *ap, int verbose, unsigned int *class)
2034 /* Bring phy back */ 2032 /* Bring phy back */
2035 sata_phy_resume(ap); 2033 sata_phy_resume(ap);
2036 2034
2037 /* Clear SError */
2038 serror = scr_read(ap, SCR_ERROR);
2039 scr_write(ap, SCR_ERROR, serror);
2040
2041 /* TODO: phy layer with polling, timeouts, etc. */ 2035 /* TODO: phy layer with polling, timeouts, etc. */
2042 if (!sata_dev_present(ap)) { 2036 if (!sata_dev_present(ap)) {
2043 *class = ATA_DEV_NONE; 2037 *class = ATA_DEV_NONE;