summaryrefslogtreecommitdiffstats
path: root/drivers/ata/sata_mv.c
diff options
context:
space:
mode:
authorMark Lord <liml@rtr.ca>2008-05-14 15:18:12 +0200
committerJeff Garzik <jgarzik@redhat.com>2008-05-19 23:27:47 +0200
commit9dcffd99d0b1c0c1b8b2c0f85d240e791eca1055 (patch)
tree25eeccca0f7268db5117adbdfe4a28592011c07f /drivers/ata/sata_mv.c
parentavr32/pata: avoid unnecessary memset (updated after comments) (diff)
downloadlinux-9dcffd99d0b1c0c1b8b2c0f85d240e791eca1055.tar.xz
linux-9dcffd99d0b1c0c1b8b2c0f85d240e791eca1055.zip
sata_mv: always do softreset
Always request a softreset after hardreset succeeds. This fixes a regression reported by Martin Michlmayr <tbm@cyrius.com>. Signed-off-by: Mark Lord <mlord@pobox.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/sata_mv.c')
-rw-r--r--drivers/ata/sata_mv.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index bb73b2222627..bbacdd90f554 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -2728,6 +2728,7 @@ static int mv_hardreset(struct ata_link *link, unsigned int *class,
rc = sata_link_hardreset(link, timing, deadline + extra,
&online, NULL);
+ rc = online ? -EAGAIN : rc;
if (rc)
return rc;
sata_scr_read(link, SCR_STATUS, &sstatus);