Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 29239
b: refs/heads/master
c: 6d5f973
h: refs/heads/master
i:
  29237: fabf264
  29235: 14be272
  29231: 0eee159
v: v3
  • Loading branch information
Tejun Heo authored and Jeff Garzik committed Apr 2, 2006
1 parent 0929020 commit 7c20129
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1ad8e7f9eb051b040880e45337ed74bfd916ef7f
refs/heads/master: 6d5f9732a16a74d75f8cdba5b00557662e83f466
13 changes: 8 additions & 5 deletions trunk/drivers/scsi/libata-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1503,20 +1503,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);
}
}

Expand Down

0 comments on commit 7c20129

Please sign in to comment.