From ba9fb8604d0ea25c9d0cd804e6092ced5ecf66bd Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Sun, 26 Jun 2005 23:27:19 +0900 Subject: [PATCH] --- yaml --- r: 3829 b: refs/heads/master c: 62ba2841f2a51848f7cb0499edae3f6803764f2c h: refs/heads/master i: 3827: 504c7131442b18215d3a836907b9162e07c16ff4 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libata-core.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5ee7f6a66b7a..9f8d66b9efba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e922256ae4bb6ef954bd7e0740d9753460e0ab72 +refs/heads/master: 62ba2841f2a51848f7cb0499edae3f6803764f2c diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c index fd66f56fd612..cb535fa185b9 100644 --- a/trunk/drivers/scsi/libata-core.c +++ b/trunk/drivers/scsi/libata-core.c @@ -1408,7 +1408,9 @@ void __sata_phy_reset(struct ata_port *ap) if (ap->flags & ATA_FLAG_SATA_RESET) { /* issue phy wake/reset */ scr_write_flush(ap, SCR_CONTROL, 0x301); - udelay(400); /* FIXME: a guess */ + /* Couldn't find anything in SATA I/II specs, but + * AHCI-1.1 10.4.2 says at least 1 ms. */ + mdelay(1); } scr_write_flush(ap, SCR_CONTROL, 0x300); /* phy wake/clear reset */