mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-05 08:26:59 +00:00
Code Issues Releases Wiki Activity

linux-can-fixes-for-5.14-20210810

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCgAxFiEEK3kIWJt9yTYMP3ehqclaivrt76kFAmESG2QTHG1rbEBwZW5n
 dXRyb25peC5kZQAKCRCpyVqK+u3vqZo6B/wPu08SJCNlxnbLB3VWSrDn4qfv+pt3
 52c8xGBKId9aMPNK4/XOY2Dprc6K2d2KsuZgX1f/35ZyaQh04BOOjH8zboeouzUf
 4ZnofCYP5JCHJLwSm36keeZZCyWWmPV4iXuPWlFcnG2mk3bZH6gm3R/UyP8BAY27
 V8ZbdChSYHFqq0ny1ppFb28gRkuuC/ygpbwmHNkIhta195wDdFirk7ASp2Ky8dbl
 vFhnL43X7PmmndSR9V2BvqhRTu6wPeum7xIh/qs7lDpGZtuBVE56CsLKJmlRagzb
 8NcwOIsRgDWo1PloLg95+aq61s8cbmicsxJ60apzJquqcExQvXy83Cty
 =3HEZ
 -----END PGP SIGNATURE-----

Merge tag 'linux-can-fixes-for-5.14-20210810' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can

linux-can-fixes-for-5.14-20210810

Marc Kleine-Budde says:

====================
pull-request: can 2021-08-10

this is a pull request of 2 patches for net/master.

Baruch Siach's patch fixes a typo for the Microchip CAN BUS Analyzer
Tool entry in the MAINTAINERS file.

Hussein Alasadi fixes the setting of the M_CAN_DBTP register in the
m_can driver. The regression git mainline in v5.14-rc1, so no backport
to stable is needed.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2021-08-10 09:53:15 +01:00
commit 31782a01d1
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MAINTAINERS
View file

@ -11327,7 +11327,7 @@ W: https://linuxtv.org
T: git git://linuxtv.org/media_tree.git
F: drivers/media/radio/radio-maxiradio*
MCAB MICROCHIP CAN BUS ANALYZER TOOL DRIVER
MCBA MICROCHIP CAN BUS ANALYZER TOOL DRIVER
R: Yasushi SHOJI <yashi@spacecubics.com>
L: linux-can@vger.kernel.org
S: Maintained

8
drivers/net/can/m_can/m_can.c
View file

@ -1164,10 +1164,10 @@ static int m_can_set_bittiming(struct net_device *dev)
FIELD_PREP(TDCR_TDCO_MASK, tdco));
}
reg_btp = FIELD_PREP(NBTP_NBRP_MASK, brp) |
FIELD_PREP(NBTP_NSJW_MASK, sjw) |
FIELD_PREP(NBTP_NTSEG1_MASK, tseg1) |
FIELD_PREP(NBTP_NTSEG2_MASK, tseg2);
reg_btp |= FIELD_PREP(DBTP_DBRP_MASK, brp) |
FIELD_PREP(DBTP_DSJW_MASK, sjw) |
FIELD_PREP(DBTP_DTSEG1_MASK, tseg1) |
FIELD_PREP(DBTP_DTSEG2_MASK, tseg2);
m_can_write(cdev, M_CAN_DBTP, reg_btp);
}