Skip to content

watchdog: Reduce severity of release without stop #6824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pelwell merged 1 commit into from
Apr 29, 2025
Merged

watchdog: Reduce severity of release without stop #6824

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion drivers/watchdog/watchdog_dev.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,7 +943,7 @@ static int watchdog_release(struct inode *inode, struct file *file)
{
struct watchdog_core_data *wd_data = file->private_data;
struct watchdog_device *wdd;
int err = -EBUSY;
int err = EBUSY; /* +ve because this may be expected behaviour */
bool running;

mutex_lock(&wd_data->lock);
Expand All @@ -967,6 +967,9 @@ static int watchdog_release(struct inode *inode, struct file *file)
if (err < 0) {
pr_crit("watchdog%d: watchdog did not stop!\n", wdd->id);
watchdog_ping(wdd);
} else if (err > 0) {
pr_info("watchdog%d: watchdog left running\n", wdd->id);
watchdog_ping(wdd);
}

watchdog_update_worker(wdd);
Expand Down