From 87ee1ae31502444398bb2b9ef7c995a32b54c0fe Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Mon, 15 May 2006 20:57:44 +0900 Subject: [PATCH] --- yaml --- r: 29291 b: refs/heads/master c: 838df6284c54447efae956fb9c243d8ba4ab0f47 h: refs/heads/master i: 29289: cd0935692a22e9b83558a35037b1e0518729371e 29287: 939d093419b32f63f9ba8ff37157315e3ce99e2e v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libata-core.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d5fbebae42e4..6ae755c891b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce5f7f3d0cab82d6c16fcb64def8bfc0a3a85dd6 +refs/heads/master: 838df6284c54447efae956fb9c243d8ba4ab0f47 diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c index 51cb9ca5519c..f29d43cb6991 100644 --- a/trunk/drivers/scsi/libata-core.c +++ b/trunk/drivers/scsi/libata-core.c @@ -2370,8 +2370,7 @@ void ata_std_probeinit(struct ata_port *ap) if ((ap->flags & ATA_FLAG_SATA) && ap->ops->scr_read) { u32 spd; - /* set cable type and resume link */ - ap->cbl = ATA_CBL_SATA; + /* resume link */ sata_phy_resume(ap); /* init sata_spd_limit to the current value */ @@ -4586,7 +4585,6 @@ static void ata_host_init(struct ata_port *ap, struct Scsi_Host *host, ap->udma_mask = ent->udma_mask; ap->flags |= ent->host_flags; ap->ops = ent->port_ops; - ap->cbl = ATA_CBL_NONE; ap->sata_spd_limit = UINT_MAX; ap->active_tag = ATA_TAG_POISON; ap->last_ctl = 0xFF; @@ -4594,6 +4592,11 @@ static void ata_host_init(struct ata_port *ap, struct Scsi_Host *host, INIT_WORK(&ap->port_task, NULL, NULL); INIT_LIST_HEAD(&ap->eh_done_q); + /* set cable type */ + ap->cbl = ATA_CBL_NONE; + if (ap->flags & ATA_FLAG_SATA) + ap->cbl = ATA_CBL_SATA; + for (i = 0; i < ATA_MAX_DEVICES; i++) { struct ata_device *dev = &ap->device[i]; dev->devno = i;