From 7cfea084335f216970ed5e46005210055668081d Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Fri, 2 Feb 2007 15:29:27 +0900 Subject: [PATCH] --- yaml --- r: 47379 b: refs/heads/master c: 34fee227dd13af593be599b19683464ac4dd4c8b h: refs/heads/master i: 47377: 42b4cb8322ae54146c966f5d5512be343433397d 47375: dcc1366fc27a19043794a435ef0f629436c2b695 v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-core.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f968bb7e3903..bea486a1d772 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f64f565bebbb4a1a4e9ccce5565c9f86458ddb1 +refs/heads/master: 34fee227dd13af593be599b19683464ac4dd4c8b diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c index 5c2e581bf990..6a2083a6d175 100644 --- a/trunk/drivers/ata/libata-core.c +++ b/trunk/drivers/ata/libata-core.c @@ -3023,6 +3023,9 @@ int sata_std_hardreset(struct ata_port *ap, unsigned int *class) return 0; } + /* wait a while before checking status, see SRST for more info */ + msleep(150); + if (ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT)) { ata_port_printk(ap, KERN_ERR, "COMRESET failed (device not ready)\n");