tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Marc Kleine-Budde says:

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

The first patch is by Zilin Guan and fixes a memory leak in the error
path of the at91_can driver's probe function.

The last patch is by me and fixes yet another error in the gs_usb's
gs_usb_receive_bulk_callback() function.

* tag 'linux-can-fixes-for-6.19-20260123' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can:
can: gs_usb: gs_usb_receive_bulk_callback(): fix error message
can: at91_can: Fix memory leak in at91_can_probe()
====================

Link: https://patch.msgid.link/20260123173241.1026226-1-mkl@pengutronix.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Jakub Kicinski f66f5c21 f6c3665b

+3 -3
+1 -1
drivers/net/can/at91_can.c
··· 1099 1099 if (IS_ERR(transceiver)) { 1100 1100 err = PTR_ERR(transceiver); 1101 1101 dev_err_probe(&pdev->dev, err, "failed to get phy\n"); 1102 - goto exit_iounmap; 1102 + goto exit_free; 1103 1103 } 1104 1104 1105 1105 dev->netdev_ops = &at91_netdev_ops;
+2 -2
drivers/net/can/usb/gs_usb.c
··· 610 610 { 611 611 struct gs_usb *parent = urb->context; 612 612 struct gs_can *dev; 613 - struct net_device *netdev; 613 + struct net_device *netdev = NULL; 614 614 int rc; 615 615 struct net_device_stats *stats; 616 616 struct gs_host_frame *hf = urb->transfer_buffer; ··· 768 768 } 769 769 } else if (rc != -ESHUTDOWN && net_ratelimit()) { 770 770 netdev_info(netdev, "failed to re-submit IN URB: %pe\n", 771 - ERR_PTR(urb->status)); 771 + ERR_PTR(rc)); 772 772 } 773 773 } 774 774