diff options
author | Tejun Heo <htejun@gmail.com> | 2006-06-12 14:11:01 +0900 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-06-12 02:10:26 -0400 |
commit | f9be7113b56eb5d013a611d9c65e8d1d2d3f7c94 (patch) | |
tree | e500b57b88989563a4b073f34a1ce8a9a1f48353 /drivers/scsi/libata-eh.c | |
parent | 551e8889509c30cda31e464e5cbe7572c4e1febd (diff) | |
download | linux-f9be7113b56eb5d013a611d9c65e8d1d2d3f7c94.tar.bz2 |
[PATCH] libata: fix ATA_EH_REVALIDATE clearing
ATA_EH_REVALIDATE should be cleared after all devices on the target
port have been revalidated. Fix ata_eh_revalidate_and_attach()
accordingly.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/scsi/libata-eh.c')
-rw-r--r-- | drivers/scsi/libata-eh.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/libata-eh.c b/drivers/scsi/libata-eh.c index f82799e22588..782dfba573a9 100644 --- a/drivers/scsi/libata-eh.c +++ b/drivers/scsi/libata-eh.c @@ -1556,8 +1556,6 @@ static int ata_eh_revalidate_and_attach(struct ata_port *ap, /* schedule the scsi_rescan_device() here */ queue_work(ata_aux_wq, &(ap->scsi_rescan_task)); - - ehc->i.action &= ~ATA_EH_REVALIDATE; } else if (dev->class == ATA_DEV_UNKNOWN && ehc->tries[dev->devno] && ata_class_enabled(ehc->classes[dev->devno])) { @@ -1578,7 +1576,9 @@ static int ata_eh_revalidate_and_attach(struct ata_port *ap, } } - if (rc) + if (rc == 0) + ehc->i.action &= ~ATA_EH_REVALIDATE; + else *r_failed_dev = dev; DPRINTK("EXIT\n"); |