Commit 79db3669 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'linux-can-fixes-for-6.19-20260109' of... 

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: default avatarJakub Kicinski <kuba@kernel.org>
parents c8a49a2f e707c591

drivers/net/can/ctucanfd/ctucanfd_base.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/net/can/usb/etas_es58x/es58x_core.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}



/**

drivers/net/can/usb/gs_usb.c

+2 −0
Original line number Diff line number Diff line
@@ -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 */