diff options
-rw-r--r-- | include/linux/libata.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 36938ae1254d..2aa1398bbd52 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
@@ -843,7 +843,7 @@ extern void ata_do_eh(struct ata_port *ap, ata_prereset_fn_t prereset, | |||
843 | (ehi)->desc_len = 0; \ | 843 | (ehi)->desc_len = 0; \ |
844 | } while (0) | 844 | } while (0) |
845 | 845 | ||
846 | static inline void ata_ehi_hotplugged(struct ata_eh_info *ehi) | 846 | static inline void __ata_ehi_hotplugged(struct ata_eh_info *ehi) |
847 | { | 847 | { |
848 | if (ehi->flags & ATA_EHI_HOTPLUGGED) | 848 | if (ehi->flags & ATA_EHI_HOTPLUGGED) |
849 | return; | 849 | return; |
@@ -851,11 +851,16 @@ static inline void ata_ehi_hotplugged(struct ata_eh_info *ehi) | |||
851 | ehi->flags |= ATA_EHI_HOTPLUGGED | ATA_EHI_RESUME_LINK; | 851 | ehi->flags |= ATA_EHI_HOTPLUGGED | ATA_EHI_RESUME_LINK; |
852 | ehi->hotplug_timestamp = jiffies; | 852 | ehi->hotplug_timestamp = jiffies; |
853 | 853 | ||
854 | ehi->err_mask |= AC_ERR_ATA_BUS; | ||
855 | ehi->action |= ATA_EH_SOFTRESET; | 854 | ehi->action |= ATA_EH_SOFTRESET; |
856 | ehi->probe_mask |= (1 << ATA_MAX_DEVICES) - 1; | 855 | ehi->probe_mask |= (1 << ATA_MAX_DEVICES) - 1; |
857 | } | 856 | } |
858 | 857 | ||
858 | static inline void ata_ehi_hotplugged(struct ata_eh_info *ehi) | ||
859 | { | ||
860 | __ata_ehi_hotplugged(ehi); | ||
861 | ehi->err_mask |= AC_ERR_ATA_BUS; | ||
862 | } | ||
863 | |||
859 | /* | 864 | /* |
860 | * qc helpers | 865 | * qc helpers |
861 | */ | 866 | */ |