mbox series

pull-request: can 2020-11-30

Message ID 20201130125307.218258-1-mkl@pengutronix.de
State Superseded
Headers show
Series pull-request: can 2020-11-30 | expand

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git tags/linux-can-fixes-for-5.10-20201130

Message

Marc Kleine-Budde Nov. 30, 2020, 12:53 p.m. UTC
Hello Jakub, hello David,

here's a pull request of 5 patches for net/master.

The first patch is by me an target the tcan4x5x bindings for the m_can driver.
It fixes the error path in the tcan4x5x_can_probe() function.

The next two patches are by Jeroen Hofstee and makes the lost of arbitration
error counters of sja1000 and the sun4i drivers consistent with the other
drivers.

Zhang Qilong contributes two patch that clean up the error path in the c_can
and kvaser_pciefd drivers.

regards,
Marc

---

The following changes since commit 4d521943f76bd0d1e68ea5e02df7aadd30b2838a:

  dt-bindings: net: correct interrupt flags in examples (2020-11-28 14:47:56 -0800)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git tags/linux-can-fixes-for-5.10-20201130

for you to fetch changes up to 13a84cf37a4cf1155a41684236c2314eb40cd65c:

  can: kvaser_pciefd: kvaser_pciefd_open(): fix error handling (2020-11-30 12:43:55 +0100)

----------------------------------------------------------------
linux-can-fixes-for-5.10-20201130

----------------------------------------------------------------
Jeroen Hofstee (2):
      can: sja1000: sja1000_err(): don't count arbitration lose as an error
      can: sun4i_can: sun4i_can_err(): don't count arbitration lose as an error

Marc Kleine-Budde (1):
      can: m_can: tcan4x5x_can_probe(): fix error path: remove erroneous clk_disable_unprepare()

Zhang Qilong (2):
      can: c_can: c_can_power_up(): fix error handling
      can: kvaser_pciefd: kvaser_pciefd_open(): fix error handling

 drivers/net/can/c_can/c_can.c     | 18 ++++++++++++++----
 drivers/net/can/kvaser_pciefd.c   |  4 +++-
 drivers/net/can/m_can/tcan4x5x.c  | 11 +++--------
 drivers/net/can/sja1000/sja1000.c |  1 -
 drivers/net/can/sun4i_can.c       |  1 -
 5 files changed, 20 insertions(+), 15 deletions(-)

Comments

Jakub Kicinski Dec. 1, 2020, 3:08 a.m. UTC | #1
On Mon, 30 Nov 2020 13:53:02 +0100 Marc Kleine-Budde wrote:
> Hello Jakub, hello David,
> 
> here's a pull request of 5 patches for net/master.
> 
> The first patch is by me an target the tcan4x5x bindings for the m_can driver.
> It fixes the error path in the tcan4x5x_can_probe() function.
> 
> The next two patches are by Jeroen Hofstee and makes the lost of arbitration
> error counters of sja1000 and the sun4i drivers consistent with the other
> drivers.
> 
> Zhang Qilong contributes two patch that clean up the error path in the c_can
> and kvaser_pciefd drivers.

Pulled, thanks!