From 1f602c442e46a60f5cccd9c3717be2145aa7adff Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Wed, 23 Apr 2008 12:14:05 +0900 Subject: [PATCH] --- yaml --- r: 93387 b: refs/heads/master c: a0b9f4bc1ec2ea25e47e7958e544fef0d122e012 h: refs/heads/master i: 93385: 3e0d354b3eca741193b346a29bfecbe7c0bb5ff6 93383: 324f654fd8f6e9af8af005dcd0cce8000faa7da8 v: v3 --- [refs] | 2 +- trunk/drivers/ata/sata_nv.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 731549755d6d..313ee753fbff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15fe982e429e0e6b7466719acb6cfd9dbfe47f0c +refs/heads/master: a0b9f4bc1ec2ea25e47e7958e544fef0d122e012 diff --git a/trunk/drivers/ata/sata_nv.c b/trunk/drivers/ata/sata_nv.c index 109b07495721..858f70610eda 100644 --- a/trunk/drivers/ata/sata_nv.c +++ b/trunk/drivers/ata/sata_nv.c @@ -1591,13 +1591,16 @@ static void nv_mcp55_thaw(struct ata_port *ap) static int nv_hardreset(struct ata_link *link, unsigned int *class, unsigned long deadline) { - unsigned int dummy; + int rc; /* SATA hardreset fails to retrieve proper device signature on - * some controllers. Don't classify on hardreset. For more - * info, see http://bugzilla.kernel.org/show_bug.cgi?id=3352 + * some controllers. Request follow up SRST. For more info, + * see http://bugzilla.kernel.org/show_bug.cgi?id=3352 */ - return sata_sff_hardreset(link, &dummy, deadline); + rc = sata_sff_hardreset(link, class, deadline); + if (rc) + return rc; + return -EAGAIN; } static void nv_adma_error_handler(struct ata_port *ap)