diff options
Diffstat (limited to 'drivers/ata/libata-eh.c')
-rw-r--r-- | drivers/ata/libata-eh.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index df3f3140c9c7..88cd22fa65cd 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c | |||
@@ -771,7 +771,7 @@ void ata_scsi_port_error_handler(struct Scsi_Host *host, struct ata_port *ap) | |||
771 | /* process port suspend request */ | 771 | /* process port suspend request */ |
772 | ata_eh_handle_port_suspend(ap); | 772 | ata_eh_handle_port_suspend(ap); |
773 | 773 | ||
774 | /* Exception might have happend after ->error_handler | 774 | /* Exception might have happened after ->error_handler |
775 | * recovered the port but before this point. Repeat | 775 | * recovered the port but before this point. Repeat |
776 | * EH in such case. | 776 | * EH in such case. |
777 | */ | 777 | */ |
@@ -1742,7 +1742,7 @@ void ata_eh_analyze_ncq_error(struct ata_link *link) | |||
1742 | * | 1742 | * |
1743 | * Analyze taskfile of @qc and further determine cause of | 1743 | * Analyze taskfile of @qc and further determine cause of |
1744 | * failure. This function also requests ATAPI sense data if | 1744 | * failure. This function also requests ATAPI sense data if |
1745 | * avaliable. | 1745 | * available. |
1746 | * | 1746 | * |
1747 | * LOCKING: | 1747 | * LOCKING: |
1748 | * Kernel thread context (may sleep). | 1748 | * Kernel thread context (may sleep). |
@@ -1893,7 +1893,7 @@ static int speed_down_verdict_cb(struct ata_ering_entry *ent, void *void_arg) | |||
1893 | * occurred during last 5 mins, NCQ_OFF. | 1893 | * occurred during last 5 mins, NCQ_OFF. |
1894 | * | 1894 | * |
1895 | * 3. If more than 8 ATA_BUS, TOUT_HSM or UNK_DEV errors | 1895 | * 3. If more than 8 ATA_BUS, TOUT_HSM or UNK_DEV errors |
1896 | * ocurred during last 5 mins, FALLBACK_TO_PIO | 1896 | * occurred during last 5 mins, FALLBACK_TO_PIO |
1897 | * | 1897 | * |
1898 | * 4. If more than 3 TOUT_HSM or UNK_DEV errors occurred | 1898 | * 4. If more than 3 TOUT_HSM or UNK_DEV errors occurred |
1899 | * during last 10 mins, NCQ_OFF. | 1899 | * during last 10 mins, NCQ_OFF. |
@@ -2577,7 +2577,7 @@ int ata_eh_reset(struct ata_link *link, int classify, | |||
2577 | if (link->flags & ATA_LFLAG_NO_SRST) | 2577 | if (link->flags & ATA_LFLAG_NO_SRST) |
2578 | softreset = NULL; | 2578 | softreset = NULL; |
2579 | 2579 | ||
2580 | /* make sure each reset attemp is at least COOL_DOWN apart */ | 2580 | /* make sure each reset attempt is at least COOL_DOWN apart */ |
2581 | if (ehc->i.flags & ATA_EHI_DID_RESET) { | 2581 | if (ehc->i.flags & ATA_EHI_DID_RESET) { |
2582 | now = jiffies; | 2582 | now = jiffies; |
2583 | WARN_ON(time_after(ehc->last_reset, now)); | 2583 | WARN_ON(time_after(ehc->last_reset, now)); |
@@ -2736,7 +2736,7 @@ int ata_eh_reset(struct ata_link *link, int classify, | |||
2736 | if (!reset) { | 2736 | if (!reset) { |
2737 | ata_link_printk(link, KERN_ERR, | 2737 | ata_link_printk(link, KERN_ERR, |
2738 | "follow-up softreset required " | 2738 | "follow-up softreset required " |
2739 | "but no softreset avaliable\n"); | 2739 | "but no softreset available\n"); |
2740 | failed_link = link; | 2740 | failed_link = link; |
2741 | rc = -EINVAL; | 2741 | rc = -EINVAL; |
2742 | goto fail; | 2742 | goto fail; |