From e5997c692398e3297072f6835da052bae0f12d5e Mon Sep 17 00:00:00 2001
From: Tejun Heo <htejun@gmail.com>
Date: Wed, 15 Feb 2006 15:01:42 +0900
Subject: [PATCH] --- yaml --- r: 21855 b: refs/heads/master c:
 56497bd5f1340cb97d94cab953b050be6f729790 h: refs/heads/master i:   21853:
 9cd47435c7449b1569e71d0a09a78eecc557e21d   21851:
 822a9a99b77bf8ba73f1d573e0612e689fef280a   21847:
 bb72b85106ed96f157e8797294098f1c713e7599   21839:
 03e0b7bbfa84be86dd601b5b08d892cccdac2b10   21823:
 453bb2d17996104786cd1e1346dc837f97d197f0 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/scsi/libata-core.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 08055f319634..3279ea2a9e68 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6aff8f1f07a7fff48121d1ad4a550f3af24ccc81
+refs/heads/master: 56497bd5f1340cb97d94cab953b050be6f729790
diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c
index 76621463b499..62340f4ef004 100644
--- a/trunk/drivers/scsi/libata-core.c
+++ b/trunk/drivers/scsi/libata-core.c
@@ -2112,7 +2112,6 @@ int sata_std_hardreset(struct ata_port *ap, int verbose, unsigned int *class)
  *	This function is invoked after a successful reset.  Note that
  *	the device might have been reset more than once using
  *	different reset methods before postreset is invoked.
- *	postreset is also reponsible for setting cable type.
  *
  *	This function is to be used as standard callback for
  *	ata_drive_*_reset().
@@ -2124,7 +2123,7 @@ void ata_std_postreset(struct ata_port *ap, unsigned int *classes)
 {
 	DPRINTK("ENTER\n");
 
-	/* set cable type */
+	/* set cable type if it isn't already set */
 	if (ap->cbl == ATA_CBL_NONE && ap->flags & ATA_FLAG_SATA)
 		ap->cbl = ATA_CBL_SATA;