From: Dan Murphy <dmurphy@ti.com>
To: Marc Kleine-Budde <mkl@pengutronix.de>, <netdev@vger.kernel.org>
Cc: <davem@davemloft.net>, <kuba@kernel.org>,
<linux-can@vger.kernel.org>, <kernel@pengutronix.de>,
Wu Bo <wubo.oduw@gmail.com>
Subject: Re: [net 12/15] can: m_can: m_can_handle_state_change(): fix state change
Date: Tue, 17 Nov 2020 08:01:52 -0600 [thread overview]
Message-ID: <7ddd0177-fdaa-0cf2-dd0d-90005ba3bf9f@ti.com> (raw)
In-Reply-To: <20201115174131.2089251-13-mkl@pengutronix.de>
Marc
On 11/15/20 11:41 AM, Marc Kleine-Budde wrote:
> From: Wu Bo <wubo.oduw@gmail.com>
>
> m_can_handle_state_change() is called with the new_state as an argument.
>
> In the switch statements for CAN_STATE_ERROR_ACTIVE, the comment and the
> following code indicate that a CAN_STATE_ERROR_WARNING is handled.
>
> This patch fixes this problem by changing the case to CAN_STATE_ERROR_WARNING.
>
> Signed-off-by: Wu Bo <wubo.oduw@gmail.com>
> Link: http://lore.kernel.org/r/20200129022330.21248-2-wubo.oduw@gmail.com
> Cc: Dan Murphy <dmurphy@ti.com>
> Fixes: e0d1f4816f2a ("can: m_can: add Bosch M_CAN controller support")
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> ---
> drivers/net/can/m_can/m_can.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c
> index 02c5795b7393..63887e23d89c 100644
> --- a/drivers/net/can/m_can/m_can.c
> +++ b/drivers/net/can/m_can/m_can.c
> @@ -665,7 +665,7 @@ static int m_can_handle_state_change(struct net_device *dev,
> unsigned int ecr;
>
> switch (new_state) {
> - case CAN_STATE_ERROR_ACTIVE:
> + case CAN_STATE_ERROR_WARNING:
> /* error warning state */
> cdev->can.can_stats.error_warning++;
> cdev->can.state = CAN_STATE_ERROR_WARNING;
> @@ -694,7 +694,7 @@ static int m_can_handle_state_change(struct net_device *dev,
> __m_can_get_berr_counter(dev, &bec);
>
> switch (new_state) {
> - case CAN_STATE_ERROR_ACTIVE:
> + case CAN_STATE_ERROR_WARNING:
> /* error warning state */
> cf->can_id |= CAN_ERR_CRTL;
> cf->data[1] = (bec.txerr > bec.rxerr) ?
Reviewed-by: Dan Murphy<dmurphy@ti.com>
next prev parent reply other threads:[~2020-11-17 14:02 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-15 17:41 pull-request: can 2020-11-15 Marc Kleine-Budde
2020-11-15 17:41 ` [net 01/15] can: af_can: prevent potential access of uninitialized member in can_rcv() Marc Kleine-Budde
2020-11-15 17:41 ` [net 02/15] can: af_can: prevent potential access of uninitialized member in canfd_rcv() Marc Kleine-Budde
2020-11-15 17:41 ` [net 03/15] can: dev: can_restart(): post buffer from the right context Marc Kleine-Budde
2020-11-15 17:41 ` [net 04/15] can: ti_hecc: Fix memleak in ti_hecc_probe Marc Kleine-Budde
2020-11-15 17:41 ` [net 05/15] can: mcba_usb: mcba_usb_start_xmit(): first fill skb, then pass to can_put_echo_skb() Marc Kleine-Budde
2020-11-15 17:41 ` [net 06/15] can: peak_usb: fix potential integer overflow on shift of a int Marc Kleine-Budde
2020-11-15 17:41 ` [net 07/15] can: flexcan: flexcan_setup_stop_mode(): add missing "req_bit" to stop mode property comment Marc Kleine-Budde
2020-11-15 17:41 ` [net 08/15] can: flexcan: fix failure handling of pm_runtime_get_sync() Marc Kleine-Budde
2020-11-15 17:41 ` [net 09/15] can: tcan4x5x: replace depends on REGMAP_SPI with depends on SPI Marc Kleine-Budde
2020-11-15 17:41 ` [net 10/15] can: tcan4x5x: tcan4x5x_can_probe(): add missing error checking for devm_regmap_init() Marc Kleine-Budde
2020-11-17 14:01 ` Dan Murphy
2020-11-15 17:41 ` [net 11/15] can: tcan4x5x: tcan4x5x_can_remove(): fix order of deregistration Marc Kleine-Budde
2020-11-17 14:00 ` Dan Murphy
2020-11-17 14:02 ` Marc Kleine-Budde
2020-11-15 17:41 ` [net 12/15] can: m_can: m_can_handle_state_change(): fix state change Marc Kleine-Budde
2020-11-17 14:01 ` Dan Murphy [this message]
2020-11-15 17:41 ` [net 13/15] can: m_can: m_can_class_free_dev(): introduce new function Marc Kleine-Budde
2020-11-15 17:41 ` [net 14/15] can: m_can: Fix freeing of can device from peripherials Marc Kleine-Budde
2020-11-15 17:41 ` [net 15/15] can: m_can: m_can_stop(): set device to software init mode before closing Marc Kleine-Budde
2020-11-16 15:37 ` pull-request: can 2020-11-15 Jakub Kicinski
-- strict thread matches above, loose matches on Subject: below --
2020-11-14 17:33 pull-request: can 2020-11-14 Marc Kleine-Budde
2020-11-14 17:33 ` [net 12/15] can: m_can: m_can_handle_state_change(): fix state change Marc Kleine-Budde
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7ddd0177-fdaa-0cf2-dd0d-90005ba3bf9f@ti.com \
--to=dmurphy@ti.com \
--cc=davem@davemloft.net \
--cc=kernel@pengutronix.de \
--cc=kuba@kernel.org \
--cc=linux-can@vger.kernel.org \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=wubo.oduw@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox