this patch fixes a null pointer derefence on imx28 related to the incomplete removal of the watchdog list in 061e10.
Signed-off-by: Jonas Rebmann <[email protected]> --- drivers/watchdog/wd_core.c | 1 - include/watchdog.h | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/watchdog/wd_core.c b/drivers/watchdog/wd_core.c index adb4c63909..d4de213fa5 100644 --- a/drivers/watchdog/wd_core.c +++ b/drivers/watchdog/wd_core.c @@ -237,7 +237,6 @@ int watchdog_deregister(struct watchdog *wd) } class_remove_device(&watchdog_class, &wd->dev); - list_del(&wd->list); return 0; } diff --git a/include/watchdog.h b/include/watchdog.h index 2a0e9d1b41..eaea07910c 100644 --- a/include/watchdog.h +++ b/include/watchdog.h @@ -28,7 +28,6 @@ struct watchdog { uint64_t last_ping; int seconds_to_expire; struct poller_async poller; - struct list_head list; int running; /* enum wdog_hw_running */ }; --- base-commit: 894166924badc0dea06c96476fb86f186e03c779 change-id: 20240918-jre-remove-watchdog-list-76667d3c3b26 Best regards, -- Jonas Rebmann <[email protected]>
