From 000b691d259c1e74cb397b3f6a6f7aa8b1e54bbd Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Sat, 8 Dec 2007 08:47:01 +0900 Subject: [PATCH] --- yaml --- r: 74998 b: refs/heads/master c: f7fe7ad4bcaba17f05d5cbf1119772c645783b08 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-core.c | 1 + trunk/drivers/ata/sata_sil.c | 11 +---------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index dfc5bd35a800..948075dcbed5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8cf32ac6578a70025be1103466da9d1d6141429e +refs/heads/master: f7fe7ad4bcaba17f05d5cbf1119772c645783b08 diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c index e4dea8623a71..b0d1dc3cdb2d 100644 --- a/trunk/drivers/ata/libata-core.c +++ b/trunk/drivers/ata/libata-core.c @@ -3923,6 +3923,7 @@ void ata_std_postreset(struct ata_link *link, unsigned int *classes) /* clear SError */ if (sata_scr_read(link, SCR_ERROR, &serror) == 0) sata_scr_write(link, SCR_ERROR, serror); + link->eh_info.serror = 0; /* is double-select really necessary? */ if (classes[0] != ATA_DEV_NONE) diff --git a/trunk/drivers/ata/sata_sil.c b/trunk/drivers/ata/sata_sil.c index 025622b14efb..f5119bf40c24 100644 --- a/trunk/drivers/ata/sata_sil.c +++ b/trunk/drivers/ata/sata_sil.c @@ -394,16 +394,7 @@ static void sil_host_intr(struct ata_port *ap, u32 bmdma2) * it's PHYRDY CHG. */ if (serror & SERR_PHYRDY_CHG) { - /* Trigger hotplug and accumulate SError only - * if the port isn't already frozen. - * Otherwise, PHY events during hardreset - * makes controllers with broken SIEN repeat - * probing needlessly. - */ - if (!(ap->pflags & ATA_PFLAG_FROZEN)) { - ata_ehi_hotplugged(&ap->link.eh_info); - ap->link.eh_info.serror |= serror; - } + ap->link.eh_info.serror |= serror; goto freeze; }