Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8575b814 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

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: default avatarTejun Heo <htejun@gmail.com>
Cc: Harald Dunkel <harald.dunkel@t-online.de>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 54936f8b

drivers/ata/libata-eh.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -2003,14 +2003,10 @@ static int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset, 
	ehc->tries[dev->devno]--;

	ehc->tries[dev->devno]--;





	switch (rc) {

	switch (rc) {

	case -EINVAL:

		/* eeek, something went very wrong, give up */

		ehc->tries[dev->devno] = 0;

		break;



	case -ENODEV:

	case -ENODEV:

		/* device missing or wrong IDENTIFY data, schedule probing */

		/* device missing or wrong IDENTIFY data, schedule probing */

		ehc->i.probe_mask |= (1 << dev->devno);

		ehc->i.probe_mask |= (1 << dev->devno);

	case -EINVAL:

		/* give it just one more chance */

		/* give it just one more chance */

		ehc->tries[dev->devno] = min(ehc->tries[dev->devno], 1);

		ehc->tries[dev->devno] = min(ehc->tries[dev->devno], 1);

	case -EIO:

	case -EIO: