aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2006-05-15 07:57:25 -0400
committerTejun Heo <htejun@gmail.com>2006-05-15 07:57:25 -0400
commite4fac92ae744cd5d5c3c1774825788e6b91a5965 (patch)
tree26af28126d5051f6bd49763ff99a9e6945c87920
parent3c567b7d1137633f3ff67cd1df94abc5fd497a85 (diff)
[PATCH] ahci: hardreset classification fix
AHCI calls ata_dev_classify() even when no device is attached which results in false class code. Fix it. Signed-off-by: Tejun Heo <htejun@gmail.com>
-rw-r--r--drivers/scsi/ahci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index d23f00230a76..c33255404ee5 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -670,7 +670,7 @@ static int ahci_hardreset(struct ata_port *ap, unsigned int *class)
670 rc = sata_std_hardreset(ap, class); 670 rc = sata_std_hardreset(ap, class);
671 ahci_start_engine(ap); 671 ahci_start_engine(ap);
672 672
673 if (rc == 0) 673 if (rc == 0 && sata_dev_present(ap))
674 *class = ahci_dev_classify(ap); 674 *class = ahci_dev_classify(ap);
675 if (*class == ATA_DEV_UNKNOWN) 675 if (*class == ATA_DEV_UNKNOWN)
676 *class = ATA_DEV_NONE; 676 *class = ATA_DEV_NONE;