Commit f66f5c21 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

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: default avatarJakub Kicinski <kuba@kernel.org>
parents f6c3665b 494fc029

drivers/net/can/at91_can.c

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

drivers/net/can/usb/gs_usb.c

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

	}

}