diff options
author | Tejun Heo <htejun@gmail.com> | 2006-02-02 04:20:00 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 01:52:53 -0500 |
commit | b911fc3ae0121ff0b72a52e58823c3f8ac3094d0 (patch) | |
tree | a0cbe5788d973d631fb4e3d1453a54799d54bc9f /drivers/scsi/libata-core.c | |
parent | c18d06f89fd09ee0059c4899e615c471d59af66a (diff) |
[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>
Diffstat (limited to 'drivers/scsi/libata-core.c')
-rw-r--r-- | drivers/scsi/libata-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index 9a785cf0c5b1..d4fb0f754c91 100644 --- 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) | |||
2472 | ata_reset_fn_t hardreset; | 2472 | ata_reset_fn_t hardreset; |
2473 | 2473 | ||
2474 | hardreset = NULL; | 2474 | hardreset = NULL; |
2475 | if (ap->cbl == ATA_CBL_SATA && ap->ops->scr_read) | 2475 | if (ap->flags & ATA_FLAG_SATA && ap->ops->scr_read) |
2476 | hardreset = sata_std_hardreset; | 2476 | hardreset = sata_std_hardreset; |
2477 | 2477 | ||
2478 | return ata_drive_probe_reset(ap, ata_std_softreset, hardreset, | 2478 | return ata_drive_probe_reset(ap, ata_std_softreset, hardreset, |