diff options
Diffstat (limited to 'drivers/ata/libata-eh.c')
-rw-r--r-- | drivers/ata/libata-eh.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index f4f9c2783821..21687bbd9a70 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c | |||
@@ -2857,11 +2857,8 @@ void ata_std_error_handler(struct ata_port *ap) | |||
2857 | struct ata_port_operations *ops = ap->ops; | 2857 | struct ata_port_operations *ops = ap->ops; |
2858 | ata_reset_fn_t hardreset = ops->hardreset; | 2858 | ata_reset_fn_t hardreset = ops->hardreset; |
2859 | 2859 | ||
2860 | /* sata_std_hardreset is inherited to all drivers from | 2860 | /* ignore built-in hardreset if SCR access is not available */ |
2861 | * ata_base_port_ops. Ignore it if SCR access is not | 2861 | if (ata_is_builtin_hardreset(hardreset) && !sata_scr_valid(&ap->link)) |
2862 | * available. | ||
2863 | */ | ||
2864 | if (hardreset == sata_sff_hardreset && !sata_scr_valid(&ap->link)) | ||
2865 | hardreset = NULL; | 2862 | hardreset = NULL; |
2866 | 2863 | ||
2867 | ata_do_eh(ap, ops->prereset, ops->softreset, hardreset, ops->postreset); | 2864 | ata_do_eh(ap, ops->prereset, ops->softreset, hardreset, ops->postreset); |