aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/libata-core.c8
-rw-r--r--drivers/scsi/sata_sil24.c2
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 92b5077ac052..2d76ce23728f 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -2232,8 +2232,10 @@ static unsigned int ata_bus_softreset(struct ata_port *ap,
2232 * the bus shows 0xFF because the odd clown forgets the D7 2232 * the bus shows 0xFF because the odd clown forgets the D7
2233 * pulldown resistor. 2233 * pulldown resistor.
2234 */ 2234 */
2235 if (ata_check_status(ap) == 0xFF) 2235 if (ata_check_status(ap) == 0xFF) {
2236 printk(KERN_ERR "ata%u: SRST failed (status 0xFF)\n", ap->id);
2236 return AC_ERR_OTHER; 2237 return AC_ERR_OTHER;
2238 }
2237 2239
2238 ata_bus_post_reset(ap, devmask); 2240 ata_bus_post_reset(ap, devmask);
2239 2241
@@ -2494,8 +2496,8 @@ int sata_std_hardreset(struct ata_port *ap, unsigned int *class)
2494 } 2496 }
2495 2497
2496 if (ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT)) { 2498 if (ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT)) {
2497 printk(KERN_ERR "ata%u: COMRESET failed " 2499 printk(KERN_ERR
2498 "(device not ready)\n", ap->id); 2500 "ata%u: COMRESET failed (device not ready)\n", ap->id);
2499 return -EIO; 2501 return -EIO;
2500 } 2502 }
2501 2503
diff --git a/drivers/scsi/sata_sil24.c b/drivers/scsi/sata_sil24.c
index 26d84e094b1d..a9506adadb6f 100644
--- a/drivers/scsi/sata_sil24.c
+++ b/drivers/scsi/sata_sil24.c
@@ -473,7 +473,7 @@ static int sil24_softreset(struct ata_port *ap, unsigned int *class)
473 writel(irq_enable, port + PORT_IRQ_ENABLE_SET); 473 writel(irq_enable, port + PORT_IRQ_ENABLE_SET);
474 474
475 if (!(irq_stat & PORT_IRQ_COMPLETE)) { 475 if (!(irq_stat & PORT_IRQ_COMPLETE)) {
476 DPRINTK("EXIT, srst failed\n"); 476 printk(KERN_ERR "ata%u: softreset failed (timeout)\n", ap->id);
477 return -EIO; 477 return -EIO;
478 } 478 }
479 479