From 721d546418c88d916d7fcda67f037dc9f05d0b08 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Mon, 16 Jul 2007 14:29:40 +0900 Subject: [PATCH] --- yaml --- r: 62013 b: refs/heads/master c: f1545154a5c96590b1992aac8ee1e2c445e301ed h: refs/heads/master i: 62011: b82cac2355e16780ba22bcfb2a35f1b303dc5554 v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-core.c | 6 ++++-- trunk/drivers/ata/libata-eh.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5d87d1fc6714..80322dff9c82 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 008a78961ec72990d09d7625ef9499d7317d040d +refs/heads/master: f1545154a5c96590b1992aac8ee1e2c445e301ed diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c index c325b7a4246a..05922e9f4fad 100644 --- a/trunk/drivers/ata/libata-core.c +++ b/trunk/drivers/ata/libata-core.c @@ -3267,9 +3267,11 @@ int sata_phy_debounce(struct ata_port *ap, const unsigned long *params, last = cur; last_jiffies = jiffies; - /* check deadline */ + /* Check deadline. If debouncing failed, return + * -EPIPE to tell upper layer to lower link speed. + */ if (time_after(jiffies, deadline)) - return -EBUSY; + return -EPIPE; } } diff --git a/trunk/drivers/ata/libata-eh.c b/trunk/drivers/ata/libata-eh.c index 183eaf466d4f..1a4397ae9e48 100644 --- a/trunk/drivers/ata/libata-eh.c +++ b/trunk/drivers/ata/libata-eh.c @@ -1790,7 +1790,7 @@ static int ata_eh_reset(struct ata_port *ap, int classify, schedule_timeout_uninterruptible(delta); } - if (reset == hardreset && + if (rc == -EPIPE || try == ARRAY_SIZE(ata_eh_reset_timeouts) - 1) sata_down_spd_limit(ap); if (hardreset)