aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2007-04-22 13:41:05 -0400
committerJeff Garzik <jeff@garzik.org>2007-04-28 14:51:33 -0400
commit0d64a233fe6a8fd45a062fe125159854ffed60c7 (patch)
tree012d6288c549e2186555c280e7960cebf693415d /drivers/ata
parent1188c0d83ca010c3799711e85e63dbde122e6a90 (diff)
libata: separate ATA_EHI_DID_RESET into DID_SOFTRESET and DID_HARDRESET
Separate ATA_EHI_DID_RESET into ATA_EHI_DID_SOFTRESET and ATA_EHI_DID_HARDRESET. ATA_EHI_DID_RESET is redefined as OR of the two flags. This patch doesn't introduce any behavior change. This will be used later to determine whether _SDD is necessary or not. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/libata-eh.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 67bf150fa66b..2bff9adcacf1 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -1671,7 +1671,10 @@ static int ata_eh_reset(struct ata_port *ap, int classify,
1671 reset == softreset ? "soft" : "hard"); 1671 reset == softreset ? "soft" : "hard");
1672 1672
1673 /* mark that this EH session started with reset */ 1673 /* mark that this EH session started with reset */
1674 ehc->i.flags |= ATA_EHI_DID_RESET; 1674 if (reset == hardreset)
1675 ehc->i.flags |= ATA_EHI_DID_HARDRESET;
1676 else
1677 ehc->i.flags |= ATA_EHI_DID_SOFTRESET;
1675 1678
1676 rc = ata_do_reset(ap, reset, classes); 1679 rc = ata_do_reset(ap, reset, classes);
1677 1680