Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+5
-10
+1
-4
drivers/net/can/Kconfig
+1
-4
drivers/net/can/Kconfig
···
1
1
# SPDX-License-Identifier: GPL-2.0-only
2
2
3
3
menuconfig CAN_DEV
4
-
tristate "CAN Device Drivers"
4
+
bool "CAN Device Drivers"
5
5
default y
6
6
depends on CAN
7
7
help
···
16
16
This section contains all the CAN(-FD) device drivers including the
17
17
virtual ones. If you own such devices or plan to use the virtual CAN
18
18
interfaces to develop applications, say Y here.
19
-
20
-
To compile as a module, choose M here: the module will be called
21
-
can-dev.
22
19
23
20
if CAN_DEV
24
21
+1
-1
drivers/net/can/Makefile
+1
-1
drivers/net/can/Makefile
+2
-3
drivers/net/can/dev/Makefile
+2
-3
drivers/net/can/dev/Makefile
···
1
1
# SPDX-License-Identifier: GPL-2.0
2
2
3
-
obj-$(CONFIG_CAN_DEV) += can-dev.o
3
+
obj-$(CONFIG_CAN) += can-dev.o
4
4
5
-
can-dev-y += skb.o
6
-
5
+
can-dev-$(CONFIG_CAN_DEV) += skb.o
7
6
can-dev-$(CONFIG_CAN_CALC_BITTIMING) += calc_bittiming.o
8
7
can-dev-$(CONFIG_CAN_NETLINK) += bittiming.o
9
8
can-dev-$(CONFIG_CAN_NETLINK) += dev.o
+1
-1
drivers/net/can/usb/gs_usb.c
+1
-1
drivers/net/can/usb/gs_usb.c
···
1074
1074
usb_free_urb(urb);
1075
1075
out_usb_kill_anchored_urbs:
1076
1076
if (!parent->active_channels) {
1077
-
usb_kill_anchored_urbs(&dev->tx_submitted);
1077
+
usb_kill_anchored_urbs(&parent->rx_submitted);
1078
1078
1079
1079
if (dev->feature & GS_CAN_FEATURE_HW_TIMESTAMP)
1080
1080
gs_usb_timestamp_stop(parent);