diff options
author | Dong Aisheng <b29396@freescale.com> | 2014-10-29 06:45:22 -0400 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2014-11-18 15:35:05 -0500 |
commit | a93f5cae67b366e4ce7e9eb336e2885309fd6612 (patch) | |
tree | e8cdbdc6d742c6529fd5131cfadb3e5913eb8cce | |
parent | 7660f633070986ab4ee41c063a90e140d5781e13 (diff) |
can: m_can: fix incorrect error messages
Fix a few error messages.
Signed-off-by: Dong Aisheng <b29396@freescale.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r-- | drivers/net/can/m_can/m_can.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c index 3ad7d88720b7..2f61676b3a97 100644 --- a/drivers/net/can/m_can/m_can.c +++ b/drivers/net/can/m_can/m_can.c | |||
@@ -608,14 +608,14 @@ static int m_can_handle_state_errors(struct net_device *dev, u32 psr) | |||
608 | 608 | ||
609 | if ((psr & PSR_EP) && | 609 | if ((psr & PSR_EP) && |
610 | (priv->can.state != CAN_STATE_ERROR_PASSIVE)) { | 610 | (priv->can.state != CAN_STATE_ERROR_PASSIVE)) { |
611 | netdev_dbg(dev, "entered error warning state\n"); | 611 | netdev_dbg(dev, "entered error passive state\n"); |
612 | work_done += m_can_handle_state_change(dev, | 612 | work_done += m_can_handle_state_change(dev, |
613 | CAN_STATE_ERROR_PASSIVE); | 613 | CAN_STATE_ERROR_PASSIVE); |
614 | } | 614 | } |
615 | 615 | ||
616 | if ((psr & PSR_BO) && | 616 | if ((psr & PSR_BO) && |
617 | (priv->can.state != CAN_STATE_BUS_OFF)) { | 617 | (priv->can.state != CAN_STATE_BUS_OFF)) { |
618 | netdev_dbg(dev, "entered error warning state\n"); | 618 | netdev_dbg(dev, "entered error bus off state\n"); |
619 | work_done += m_can_handle_state_change(dev, | 619 | work_done += m_can_handle_state_change(dev, |
620 | CAN_STATE_BUS_OFF); | 620 | CAN_STATE_BUS_OFF); |
621 | } | 621 | } |
@@ -627,7 +627,7 @@ static void m_can_handle_other_err(struct net_device *dev, u32 irqstatus) | |||
627 | { | 627 | { |
628 | if (irqstatus & IR_WDI) | 628 | if (irqstatus & IR_WDI) |
629 | netdev_err(dev, "Message RAM Watchdog event due to missing READY\n"); | 629 | netdev_err(dev, "Message RAM Watchdog event due to missing READY\n"); |
630 | if (irqstatus & IR_BEU) | 630 | if (irqstatus & IR_ELO) |
631 | netdev_err(dev, "Error Logging Overflow\n"); | 631 | netdev_err(dev, "Error Logging Overflow\n"); |
632 | if (irqstatus & IR_BEU) | 632 | if (irqstatus & IR_BEU) |
633 | netdev_err(dev, "Bit Error Uncorrected\n"); | 633 | netdev_err(dev, "Bit Error Uncorrected\n"); |