[PATCH] libata: fix ata_std_probe_reset() SATA detection

ap->cbl is initialized during postreset and thus unknown on entry to
ata_std_probe_reset().  This patch makes ata_std_probe_reset() use
ATA_FLAG_SATA flag instead of ap->cbl to detect SATA port.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 9a785cf0c5b1bbd05417ea137424fdbcc814552c..d4fb0f754c916d0e1bf52c018d3c21338171b2ab 100644 (file)
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -2472,7 +2472,7 @@ int ata_std_probe_reset(struct ata_port *ap, unsigned int *classes)
        ata_reset_fn_t hardreset;
 
        hardreset = NULL;
-       if (ap->cbl == ATA_CBL_SATA && ap->ops->scr_read)
+       if (ap->flags & ATA_FLAG_SATA && ap->ops->scr_read)
                hardreset = sata_std_hardreset;
 
        return ata_drive_probe_reset(ap, ata_std_softreset, hardreset,