diff options
| author | Tejun Heo | 2007-04-22 19:41:05 +0200 |
|---|---|---|
| committer | Jeff Garzik | 2007-04-28 20:51:33 +0200 |
| commit | 0d64a233fe6a8fd45a062fe125159854ffed60c7 (patch) | |
| tree | 012d6288c549e2186555c280e7960cebf693415d /drivers/ata/libata-eh.c | |
| parent | ahci: consolidate common port flags (diff) | |
| download | kernel-qcow2-linux-0d64a233fe6a8fd45a062fe125159854ffed60c7.tar.gz kernel-qcow2-linux-0d64a233fe6a8fd45a062fe125159854ffed60c7.tar.xz kernel-qcow2-linux-0d64a233fe6a8fd45a062fe125159854ffed60c7.zip | |
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/libata-eh.c')
| -rw-r--r-- | drivers/ata/libata-eh.c | 5 |
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, reset == softreset ? "soft" : "hard"); /* mark that this EH session started with reset */ - ehc->i.flags |= ATA_EHI_DID_RESET; + if (reset == hardreset) + ehc->i.flags |= ATA_EHI_DID_HARDRESET; + else + ehc->i.flags |= ATA_EHI_DID_SOFTRESET; rc = ata_do_reset(ap, reset, classes); |