Skip to content

Commit f66f5c2

Browse files
committed
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>
2 parents f6c3665 + 494fc02 commit f66f5c2

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

drivers/net/can/at91_can.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1099,7 +1099,7 @@ static int at91_can_probe(struct platform_device *pdev)
10991099
if (IS_ERR(transceiver)) {
11001100
err = PTR_ERR(transceiver);
11011101
dev_err_probe(&pdev->dev, err, "failed to get phy\n");
1102-
goto exit_iounmap;
1102+
goto exit_free;
11031103
}
11041104

11051105
dev->netdev_ops = &at91_netdev_ops;

drivers/net/can/usb/gs_usb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ static void gs_usb_receive_bulk_callback(struct urb *urb)
610610
{
611611
struct gs_usb *parent = urb->context;
612612
struct gs_can *dev;
613-
struct net_device *netdev;
613+
struct net_device *netdev = NULL;
614614
int rc;
615615
struct net_device_stats *stats;
616616
struct gs_host_frame *hf = urb->transfer_buffer;
@@ -768,7 +768,7 @@ static void gs_usb_receive_bulk_callback(struct urb *urb)
768768
}
769769
} else if (rc != -ESHUTDOWN && net_ratelimit()) {
770770
netdev_info(netdev, "failed to re-submit IN URB: %pe\n",
771-
ERR_PTR(urb->status));
771+
ERR_PTR(rc));
772772
}
773773
}
774774

0 commit comments

Comments
 (0)