Skip to content

Commit 194b914

Browse files
authored
Revert kernel patch breaking 6.12.43 build for Tinker (#4257)
Revert patch added to 6.12.43 which breaks the build of CAN_TI_HECC module present in Tinker config. While it's quite unlikely anyone would be using it, so we could just simply disable the module, this seems to be a better solution.
1 parent 9d110c1 commit 194b914

File tree

1 file changed

+32
-0
lines changed

1 file changed

+32
-0
lines changed
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
From 1ce3a9bcf0b0b69e62411879113d83452c1b859e Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <[email protected]>
3+
Date: Thu, 28 Aug 2025 10:34:56 +0200
4+
Subject: [PATCH] Revert "can: ti_hecc: fix -Woverflow compiler warning"
5+
MIME-Version: 1.0
6+
Content-Type: text/plain; charset=UTF-8
7+
Content-Transfer-Encoding: 8bit
8+
9+
This reverts commit 1da38b70d90f8529c060dd380d0c18e6d9595463.
10+
11+
There is no BIT_U32 in 6.12.y, the patch was incorrectly applied to 6.12
12+
series.
13+
14+
Link: https://lore.kernel.org/stable/[email protected]/
15+
Signed-off-by: Jan Čermák <[email protected]>
16+
---
17+
drivers/net/can/ti_hecc.c | 2 +-
18+
1 file changed, 1 insertion(+), 1 deletion(-)
19+
20+
diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c
21+
index e6d6661a908ab..644e8b8eb91e7 100644
22+
--- a/drivers/net/can/ti_hecc.c
23+
+++ b/drivers/net/can/ti_hecc.c
24+
@@ -383,7 +383,7 @@ static void ti_hecc_start(struct net_device *ndev)
25+
* overflows instead of the hardware silently dropping the
26+
* messages.
27+
*/
28+
- mbx_mask = ~BIT_U32(HECC_RX_LAST_MBOX);
29+
+ mbx_mask = ~BIT(HECC_RX_LAST_MBOX);
30+
hecc_write(priv, HECC_CANOPC, mbx_mask);
31+
32+
/* Enable interrupts */

0 commit comments

Comments
 (0)