forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'upstream'

Browse source
This commit is contained in:
Jeff Garzik 2006-04-02 11:38:12 -04:00
commit a808be8a12
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
drivers/scsi/libata-core.c
View file

@ -1517,20 +1517,23 @@ void ata_port_probe(struct ata_port *ap)
*/ */
static void sata_print_link_status(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) if (!ap->ops->scr_read)
return; return;
sstatus = scr_read(ap, SCR_STATUS); sstatus = scr_read(ap, SCR_STATUS);
scontrol = scr_read(ap, SCR_CONTROL);
if (sata_dev_present(ap)) { if (sata_dev_present(ap)) {
tmp = (sstatus >> 4) & 0xf; tmp = (sstatus >> 4) & 0xf;
printk(KERN_INFO "ata%u: SATA link up %s (SStatus %X)\n", printk(KERN_INFO
ap->id, sata_spd_string(tmp), sstatus); "ata%u: SATA link up %s (SStatus %X SControl %X)\n",
ap->id, sata_spd_string(tmp), sstatus, scontrol);
} else { } else {
printk(KERN_INFO "ata%u: SATA link down (SStatus %X)\n", printk(KERN_INFO
ap->id, sstatus); "ata%u: SATA link down (SStatus %X SControl %X)\n",
ap->id, sstatus, scontrol);
} }
} }