From: Tejun Heo Date: Fri, 11 May 2007 12:46:51 +0000 (+0200) Subject: libata: give devices one last chance even if recovery failed with -EINVAL X-Git-Tag: v2.6.22-rc1~19^2~8 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8575b814097af648dad284bd3087875a11b13d18;p=linux-2.6-omap-h63xx.git libata: give devices one last chance even if recovery failed with -EINVAL After certain errors, some devices report complete garbage on IDENTIFY. This can cause ata_dev_read_id() to fail with -EINVAL resulting in immediate disabling of the device. Give the device one last chance after -EINVAL to allow recovery from such situations. As -EINVAL is triggered very rarely, this shouldn't cause any noticeable affect on more common error paths. Signed-off-by: Tejun Heo Cc: Harald Dunkel Signed-off-by: Jeff Garzik --- diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index ee9bb534153..5309c312f51 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c @@ -2003,14 +2003,10 @@ static int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset, ehc->tries[dev->devno]--; switch (rc) { - case -EINVAL: - /* eeek, something went very wrong, give up */ - ehc->tries[dev->devno] = 0; - break; - case -ENODEV: /* device missing or wrong IDENTIFY data, schedule probing */ ehc->i.probe_mask |= (1 << dev->devno); + case -EINVAL: /* give it just one more chance */ ehc->tries[dev->devno] = min(ehc->tries[dev->devno], 1); case -EIO: