jsauer/torvalds-linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-11 17:10:13 +00:00
Code

linux-can-fixes-for-6.19-20251210

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCgAxFiEEn/sM2K9nqF/8FWzzDHRl3/mQkZwFAmk5L74THG1rbEBwZW5n
 dXRyb25peC5kZQAKCRAMdGXf+ZCRnOSNCACjywpibubStsI/mEHXfsP8Iavu7U/w
 YZXnfsoTaR/TTYIKmuGo0KVEGrErzV4zBI/kaSWlXweZCepAASJ31AUykVWEoaYx
 x0hYagsrICSMEE+/amWMEnKNU8FGNHB6lxlkAdyKZWyhBgT55C35SAmavBEVjw/i
 stQyDAunBKfT2AEtL1CedxM7c1rTMxoK81t1igJCeB4i5khDjC4iQuOTLunbAVES
 XJcKa+1VOWt+/VLpm+6UhYHzb8nM9NuifbdMmb2d9rnDoTG40YSw0/5/X48TCty9
 hNwwkH3xDhP052Qq0aFlXde4U7rM1sftTvGrP6EeZRuu/creETOCn/Y7
 =69I5
 -----END PGP SIGNATURE-----

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

Marc Kleine-Budde says:

====================
pull-request: can 2025-12-10

Arnd Bergmann's patch fixes a build dependency with the CAN protocols
and drivers introduced in the current development cycle.

The last patch is by me and fixes the error handling cleanup in the
gs_usb driver.

* tag 'linux-can-fixes-for-6.19-20251210' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can:
  can: gs_usb: gs_can_open(): fix error handling
  can: fix build dependency
====================

Link: https://patch.msgid.link/20251210083448.2116869-1-mkl@pengutronix.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2025-12-11 01:02:29 -08:00
commit 95f3013e88
5 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/can/Kconfig
View File

@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
menuconfig CAN_DEV
tristate "CAN Device Drivers"
bool "CAN Device Drivers"
default y
depends on CAN
help
@ -17,9 +17,6 @@ menuconfig CAN_DEV
virtual ones. If you own such devices or plan to use the virtual CAN
interfaces to develop applications, say Y here.
To compile as a module, choose M here: the module will be called
can-dev.
if CAN_DEV
config CAN_VCAN

2
drivers/net/can/Makefile
View File

@ -7,7 +7,7 @@ obj-$(CONFIG_CAN_VCAN) += vcan.o
obj-$(CONFIG_CAN_VXCAN) += vxcan.o
obj-$(CONFIG_CAN_SLCAN) += slcan/
obj-y += dev/
obj-$(CONFIG_CAN_DEV) += dev/
obj-y += esd/
obj-y += rcar/
obj-y += rockchip/

5
drivers/net/can/dev/Makefile
View File

@ -1,9 +1,8 @@
# SPDX-License-Identifier: GPL-2.0
obj-$(CONFIG_CAN_DEV) += can-dev.o
can-dev-y += skb.o
obj-$(CONFIG_CAN) += can-dev.o
can-dev-$(CONFIG_CAN_DEV) += skb.o
can-dev-$(CONFIG_CAN_CALC_BITTIMING) += calc_bittiming.o
can-dev-$(CONFIG_CAN_NETLINK) += bittiming.o
can-dev-$(CONFIG_CAN_NETLINK) += dev.o

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

@ -1074,7 +1074,7 @@ out_usb_free_urb:
usb_free_urb(urb);
out_usb_kill_anchored_urbs:
if (!parent->active_channels) {
usb_kill_anchored_urbs(&dev->tx_submitted);
usb_kill_anchored_urbs(&parent->rx_submitted);
if (dev->feature & GS_CAN_FEATURE_HW_TIMESTAMP)
gs_usb_timestamp_stop(parent);

1
net/can/Kconfig
View File

@ -5,7 +5,6 @@
menuconfig CAN
tristate "CAN bus subsystem support"
select CAN_DEV
help
Controller Area Network (CAN) is a slow (up to 1Mbit/s) serial
communications protocol. Development of the CAN bus started in