leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] libata: make reset methods complain when they fail

Browse Source 
Make reset methods complain loud when they fail.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Tejun Heo 2006-04-11 22:16:45 +09:00 committed by Jeff Garzik
parent 2bf2cb26b2
commit 987d2f05b3
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/scsi/libata-core.c
View File

@ -2232,8 +2232,10 @@ static unsigned int ata_bus_softreset(struct ata_port *ap,
* the bus shows 0xFF because the odd clown forgets the D7
* pulldown resistor.
*/
if (ata_check_status(ap) == 0xFF)
if (ata_check_status(ap) == 0xFF) {
printk(KERN_ERR "ata%u: SRST failed (status 0xFF)\n", ap->id);
return AC_ERR_OTHER;
}
ata_bus_post_reset(ap, devmask);
@ -2494,8 +2496,8 @@ int sata_std_hardreset(struct ata_port *ap, unsigned int *class)
}
if (ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT)) {
printk(KERN_ERR "ata%u: COMRESET failed "
"(device not ready)\n", ap->id);
printk(KERN_ERR
"ata%u: COMRESET failed (device not ready)\n", ap->id);
return -EIO;
}

2
drivers/scsi/sata_sil24.c
View File

@ -473,7 +473,7 @@ static int sil24_softreset(struct ata_port *ap, unsigned int *class)
writel(irq_enable, port + PORT_IRQ_ENABLE_SET);
if (!(irq_stat & PORT_IRQ_COMPLETE)) {
DPRINTK("EXIT, srst failed\n");
printk(KERN_ERR "ata%u: softreset failed (timeout)\n", ap->id);
return -EIO;
}