summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-13 05:56:20 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-13 05:56:20 +0100
commit2d13c8f0682bd38c74e89a76cc550f0324b610ba (patch)
tree8e2286479c18f5ee076d26ee44ff03b44d38a299 /include
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
parentlibata: retry link resume if necessary (diff)
downloadlinux-2d13c8f0682bd38c74e89a76cc550f0324b610ba.tar.xz
linux-2d13c8f0682bd38c74e89a76cc550f0324b610ba.zip
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: retry link resume if necessary ata_piix: enable 32bit PIO on SATA piix sata_promise: don't classify overruns as HSM errors
Diffstat (limited to 'include')
-rw-r--r--include/linux/libata.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 6a9c4ddd3d95..73112250862c 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -354,6 +354,9 @@ enum {
/* max tries if error condition is still set after ->error_handler */
ATA_EH_MAX_TRIES = 5,
+ /* sometimes resuming a link requires several retries */
+ ATA_LINK_RESUME_TRIES = 5,
+
/* how hard are we gonna try to probe/recover devices */
ATA_PROBE_MAX_TRIES = 3,
ATA_EH_DEV_TRIES = 3,