Some devices react badly if resets are performed back-to-back. Give devices some time to breath and tell user that we're taking a nap. Signed-off-by: Tejun Heo <htejun@xxxxxxxxx> --- The last message was missing '\n'. Other than that, identical patch. libata-core.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) Index: work/drivers/scsi/libata-core.c =================================================================== --- work.orig/drivers/scsi/libata-core.c 2006-04-02 20:38:21.000000000 +0900 +++ work/drivers/scsi/libata-core.c 2006-04-02 20:38:21.000000000 +0900 @@ -2585,6 +2585,9 @@ int ata_drive_probe_reset(struct ata_por rc = ata_do_reset(ap, softreset, postreset, 0, classes); if (rc == 0 && classes[0] != ATA_DEV_UNKNOWN) goto done; + printk(KERN_INFO "ata%u: softreset failed, will try " + "hardreset in 5 secs\n", ap->id); + ssleep(5); } if (!hardreset) @@ -2600,10 +2603,20 @@ int ata_drive_probe_reset(struct ata_por if (ata_down_sata_spd_limit(ap)) goto done; + + printk(KERN_INFO "ata%u: hardreset failed, will retry " + "in 5 secs\n", ap->id); + ssleep(5); } - if (softreset) + if (softreset) { + printk(KERN_INFO "ata%u: hardreset succeeded without " + "classification, will retry softreset in 5 secs\n", + ap->id); + ssleep(5); + rc = ata_do_reset(ap, softreset, postreset, 0, classes); + } done: if (rc == 0 && classes[0] == ATA_DEV_UNKNOWN) - : send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html