github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 00:53:34 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

linux-can-fixes-for-6.19-20260109

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCgAxFiEEn/sM2K9nqF/8FWzzDHRl3/mQkZwFAmlhAmoTHG1rbEBwZW5n
 dXRyb25peC5kZQAKCRAMdGXf+ZCRnA5tB/9ZClrhjkdsJ9D2WF+Non00cYCFkHb0
 xtBBzyQaBgZ0vFpdW4u97nLfBizyKdsrDmSaN/PluQjDsSJZ3GzhXZBC0xFIbf9t
 jm1QCr87le3qjP7/sRUoXOifUp2ZNeZPK1lX8Nw1cagqJpL3960DevEMmXSOY5qd
 BRhQjjHef37Qb44CC1ca4wXeRX9rXFJTRLEGoWosh8t31/OhHeTleN2YGrnVibI0
 TiLfk70O5TX1ldFqfEHmX3U4dqmFrOekEhf7Ve5PQXDPr+HLqt0I8sq5OkAhAvPx
 qpCnP4X49CIwdlFHF0EuY88zuqkYa4Fu8MHXia/vD4nIXzvptNAmn2gZ
 =MLl0
 -----END PGP SIGNATURE-----

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

Marc Kleine-Budde says:

====================
pull-request: can 2026-01-09

The first patch is by Szymon Wilczek and fixes a potential memory leak
in the etas_es58x driver.

The 2nd patch is by me, targets the gs_usb driver and fixes an URB
memory leak.

Ondrej Ille's patch fixes the transceiver delay compensation in the
ctucanfd driver, which is needed for bit rates higher than 1 Mbit/s.

* tag 'linux-can-fixes-for-6.19-20260109' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can:
  can: ctucanfd: fix SSP_SRC in cases when bit-rate is higher than 1 MBit.
  can: gs_usb: gs_usb_receive_bulk_callback(): fix URB memory leak
  can: etas_es58x: allow partial RX URB allocation to succeed
====================

Link: https://patch.msgid.link/20260109135311.576033-1-mkl@pengutronix.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2026-01-10 14:35:32 -08:00
commit 79db36697b
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/can/ctucanfd/ctucanfd_base.c
View File

@ -310,7 +310,7 @@ static int ctucan_set_secondary_sample_point(struct net_device *ndev)
}
ssp_cfg = FIELD_PREP(REG_TRV_DELAY_SSP_OFFSET, ssp_offset);
ssp_cfg |= FIELD_PREP(REG_TRV_DELAY_SSP_SRC, 0x1);
ssp_cfg |= FIELD_PREP(REG_TRV_DELAY_SSP_SRC, 0x0);
}
ctucan_write32(priv, CTUCANFD_TRV_DELAY, ssp_cfg);

2
drivers/net/can/usb/etas_es58x/es58x_core.c
View File

@ -1736,7 +1736,7 @@ static int es58x_alloc_rx_urbs(struct es58x_device *es58x_dev)
dev_dbg(dev, "%s: Allocated %d rx URBs each of size %u\n",
__func__, i, rx_buf_len);
return ret;
return 0;
}
/**

2
drivers/net/can/usb/gs_usb.c
View File

@ -751,6 +751,8 @@ static void gs_usb_receive_bulk_callback(struct urb *urb)
hf, parent->hf_size_rx,
gs_usb_receive_bulk_callback, parent);
usb_anchor_urb(urb, &parent->rx_submitted);
rc = usb_submit_urb(urb, GFP_ATOMIC);
/* USB failure take down all interfaces */