]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
sata_mv: always do softreset
authorMark Lord <liml@rtr.ca>
Wed, 14 May 2008 13:18:12 +0000 (09:18 -0400)
committerJeff Garzik <jgarzik@redhat.com>
Mon, 19 May 2008 21:27:47 +0000 (17:27 -0400)
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>
drivers/ata/sata_mv.c

index bb73b2222627b9b6a05f96057da351c7d417f935..bbacdd90f55409c3e8c9029c0fc4d5af4f351ed3 100644 (file)
@@ -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);