qiurui/Centos-kernel-stream-10
1
0
Fork 0
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10.git synced 2026-09-09 00:07:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

watchdog: s32g_wdt: remove incorrect options in watchdog_info struct

Browse Source 
JIRA: https://redhat.atlassian.net/browse/RHEL-248519

commit 2b37415618bfc6a83d4aceb00fd8d6491096f2ed
Author: Ethan Nelson-Moore <enelsonmoore@gmail.com>
Date:   Mon May 4 19:44:09 2026 -0700

    watchdog: s32g_wdt: remove incorrect options in watchdog_info struct
    
    The s32g_wdt driver uses two incorrect constants in the options field
    of its watchdog_info struct. This bit mask should contain WDIOF_*
    constants, but the driver uses two WDIOC_* ioctl constants (in addition
    to correct WDIOF_* constants). This causes many incorrect bits to be
    set in the bit mask. The functionality indicated by these ioctl
    constants is supported by all drivers using the watchdog framework, so
    this patch simply removes them.
    
    Fixes: bd3f54ec559b ("watchdog: Add the Watchdog Timer for the NXP S32 platform")
    Cc: stable@vger.kernel.org # 6.18+
    Signed-off-by: Ethan Nelson-Moore <enelsonmoore@gmail.com>
    Acked-by: Daniel Lezcano <daniel.lezcano@oss.qualcomm.com>
    Link: https://lore.kernel.org/r/20260505024409.60301-1-enelsonmoore@gmail.com
    Signed-off-by: Guenter Roeck <linux@roeck-us.net>

Signed-off-by: Jared Kangas <jkangas@redhat.com>
This commit is contained in:
Jared Kangas
2026-08-25 12:07:28 -07:00
parent 28265fc4cd
commit ae28eabc80
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/watchdog/s32g_wdt.c
+1 -2
View File
@@ -56,8 +56,7 @@ MODULE_PARM_DESC(early_enable,
static const struct watchdog_info s32g_wdt_info = {
.identity = "s32g watchdog",
.options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE |
WDIOC_GETTIMEOUT | WDIOC_GETTIMELEFT,
.options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE,
};
static struct s32g_wdt_device *wdd_to_s32g_wdt(struct watchdog_device *wdd)