Move source tree closer to the 2.6.32.17 mainline
/drivers/ata/libata-eh.c
blob:e30b9e74794b2966571b0fb660544bd329304c65 -> blob:fa9bed06b397b3c845e75a3d1820df8e524a4a27
--- drivers/ata/libata-eh.c
+++ drivers/ata/libata-eh.c
@@ -3149,6 +3149,10 @@ static int ata_eh_skip_recovery(struct a
if (link->flags & ATA_LFLAG_DISABLED)
return 1;
+ /* skip if explicitly requested */
+ if (ehc->i.flags & ATA_EHI_NO_RECOVERY)
+ return 1;
+
/* thaw frozen port and recover failed devices */
if ((ap->pflags & ATA_PFLAG_FROZEN) || ata_link_nr_enabled(link))
return 0;