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

linux-can-fixes-for-6.19-20260123

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCgAxFiEEn/sM2K9nqF/8FWzzDHRl3/mQkZwFAmlzrWoTHG1rbEBwZW5n
 dXRyb25peC5kZQAKCRAMdGXf+ZCRnLwLCAC2T9y0HX73ALx8NJ9fmWJIxdR/Ml29
 2xw837GirA6EWlkx60UJARhFNNEMP5OZw293DMlQ4MsW4cMfUZfwq66tZJ50PA+8
 jfxC7eE7VED6yQxyvWSb222Rh8Y+l7Wk9/K1Vw9Gd0llFLqvmlGLIWRJfCAdy0wz
 OdcJWwsmY0XIb4dcTfhOskuUe2i6EVLiaIUS8I1Jl4jXegBrLfzc3Rwda0hr33qM
 lkZBx/j4/eRp5qqYw9yOvsiZtwNNqhwVzUe3rf6fiiu/Dse0QuTBVTVP5SpNE8bg
 D/psUBqGJa9z5WD5nuHgKp0HdizXPt2SmjzfQU+z23w8QLu8+8w2eM2+
 =AWbF
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Jakub Kicinski 2026-01-25 13:01:15 -08:00
commit f66f5c212e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/can/at91_can.c
View File

@ -1099,7 +1099,7 @@ static int at91_can_probe(struct platform_device *pdev)
if (IS_ERR(transceiver)) {
err = PTR_ERR(transceiver);
dev_err_probe(&pdev->dev, err, "failed to get phy\n");
goto exit_iounmap;
goto exit_free;
}
dev->netdev_ops = &at91_netdev_ops;

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

@ -610,7 +610,7 @@ static void gs_usb_receive_bulk_callback(struct urb *urb)
{
struct gs_usb *parent = urb->context;
struct gs_can *dev;
struct net_device *netdev;
struct net_device *netdev = NULL;
int rc;
struct net_device_stats *stats;
struct gs_host_frame *hf = urb->transfer_buffer;
@ -768,7 +768,7 @@ static void gs_usb_receive_bulk_callback(struct urb *urb)
}
} else if (rc != -ESHUTDOWN && net_ratelimit()) {
netdev_info(netdev, "failed to re-submit IN URB: %pe\n",
ERR_PTR(urb->status));
ERR_PTR(rc));
}
}