diff options
Diffstat (limited to 'drivers/ata/sata_mv.c')
-rw-r--r-- | drivers/ata/sata_mv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 80ade5b93b86..b4b737e081e8 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c | |||
@@ -1411,12 +1411,12 @@ static void mv_err_intr(struct ata_port *ap, struct ata_queued_cmd *qc) | |||
1411 | EDMA_ERR_INTRL_PAR)) { | 1411 | EDMA_ERR_INTRL_PAR)) { |
1412 | err_mask |= AC_ERR_ATA_BUS; | 1412 | err_mask |= AC_ERR_ATA_BUS; |
1413 | action |= ATA_EH_HARDRESET; | 1413 | action |= ATA_EH_HARDRESET; |
1414 | ata_ehi_push_desc(ehi, ", parity error"); | 1414 | ata_ehi_push_desc(ehi, "parity error"); |
1415 | } | 1415 | } |
1416 | if (edma_err_cause & (EDMA_ERR_DEV_DCON | EDMA_ERR_DEV_CON)) { | 1416 | if (edma_err_cause & (EDMA_ERR_DEV_DCON | EDMA_ERR_DEV_CON)) { |
1417 | ata_ehi_hotplugged(ehi); | 1417 | ata_ehi_hotplugged(ehi); |
1418 | ata_ehi_push_desc(ehi, edma_err_cause & EDMA_ERR_DEV_DCON ? | 1418 | ata_ehi_push_desc(ehi, edma_err_cause & EDMA_ERR_DEV_DCON ? |
1419 | ", dev disconnect" : ", dev connect"); | 1419 | "dev disconnect" : "dev connect"); |
1420 | } | 1420 | } |
1421 | 1421 | ||
1422 | if (IS_GEN_I(hpriv)) { | 1422 | if (IS_GEN_I(hpriv)) { |
@@ -1425,7 +1425,7 @@ static void mv_err_intr(struct ata_port *ap, struct ata_queued_cmd *qc) | |||
1425 | if (edma_err_cause & EDMA_ERR_SELF_DIS_5) { | 1425 | if (edma_err_cause & EDMA_ERR_SELF_DIS_5) { |
1426 | struct mv_port_priv *pp = ap->private_data; | 1426 | struct mv_port_priv *pp = ap->private_data; |
1427 | pp->pp_flags &= ~MV_PP_FLAG_EDMA_EN; | 1427 | pp->pp_flags &= ~MV_PP_FLAG_EDMA_EN; |
1428 | ata_ehi_push_desc(ehi, ", EDMA self-disable"); | 1428 | ata_ehi_push_desc(ehi, "EDMA self-disable"); |
1429 | } | 1429 | } |
1430 | } else { | 1430 | } else { |
1431 | eh_freeze_mask = EDMA_EH_FREEZE; | 1431 | eh_freeze_mask = EDMA_EH_FREEZE; |
@@ -1433,7 +1433,7 @@ static void mv_err_intr(struct ata_port *ap, struct ata_queued_cmd *qc) | |||
1433 | if (edma_err_cause & EDMA_ERR_SELF_DIS) { | 1433 | if (edma_err_cause & EDMA_ERR_SELF_DIS) { |
1434 | struct mv_port_priv *pp = ap->private_data; | 1434 | struct mv_port_priv *pp = ap->private_data; |
1435 | pp->pp_flags &= ~MV_PP_FLAG_EDMA_EN; | 1435 | pp->pp_flags &= ~MV_PP_FLAG_EDMA_EN; |
1436 | ata_ehi_push_desc(ehi, ", EDMA self-disable"); | 1436 | ata_ehi_push_desc(ehi, "EDMA self-disable"); |
1437 | } | 1437 | } |
1438 | 1438 | ||
1439 | if (edma_err_cause & EDMA_ERR_SERR) { | 1439 | if (edma_err_cause & EDMA_ERR_SERR) { |