From: Jeff Garzik <jeff@garzik.org>
Date: Sun, 2 Apr 2006 15:38:12 +0000 (-0400)
Subject: Merge branch 'upstream'
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=a808be8a12d61cdacba350fdce2e448045be8202;hp=c13b56a1130bbfacfb588de100e5a248383805a6;p=deliverable%2Flinux.git

Merge branch 'upstream'
---

diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index fc3e57f84268..56537293ad41 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -1517,20 +1517,23 @@ void ata_port_probe(struct ata_port *ap)
  */
 static void sata_print_link_status(struct ata_port *ap)
 {
-	u32 sstatus, tmp;
+	u32 sstatus, scontrol, tmp;
 
 	if (!ap->ops->scr_read)
 		return;
 
 	sstatus = scr_read(ap, SCR_STATUS);
+	scontrol = scr_read(ap, SCR_CONTROL);
 
 	if (sata_dev_present(ap)) {
 		tmp = (sstatus >> 4) & 0xf;
-		printk(KERN_INFO "ata%u: SATA link up %s (SStatus %X)\n",
-		       ap->id, sata_spd_string(tmp), sstatus);
+		printk(KERN_INFO
+		       "ata%u: SATA link up %s (SStatus %X SControl %X)\n",
+		       ap->id, sata_spd_string(tmp), sstatus, scontrol);
 	} else {
-		printk(KERN_INFO "ata%u: SATA link down (SStatus %X)\n",
-		       ap->id, sstatus);
+		printk(KERN_INFO
+		       "ata%u: SATA link down (SStatus %X SControl %X)\n",
+		       ap->id, sstatus, scontrol);
 	}
 }