diff options
| author | Mark Brown <broonie@kernel.org> | 2026-07-26 21:20:35 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-07-26 21:20:35 +0100 |
| commit | bc8e60dddff905d5276e4831d3ce27a67f5278a3 (patch) | |
| tree | 794dd89c982fc0fb8e68f9f18db59aa48a9839ba /drivers | |
| parent | ba3ba907434a1a531125a2b62b5a68f26fab4378 (diff) | |
| parent | 66733ed01faea1c05100de4fbee29f8049d69a9b (diff) | |
| download | linux-next-bc8e60dddff905d5276e4831d3ce27a67f5278a3.tar.gz linux-next-bc8e60dddff905d5276e4831d3ce27a67f5278a3.zip | |
Merge branch 'watchdog' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/watchdog/atcwdt200_wdt.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/watchdog/atcwdt200_wdt.c b/drivers/watchdog/atcwdt200_wdt.c index 8e3b18aea368..7e757c217b0b 100644 --- a/drivers/watchdog/atcwdt200_wdt.c +++ b/drivers/watchdog/atcwdt200_wdt.c @@ -260,9 +260,9 @@ static void atcwdt_get_timeout_params(struct atcwdt_drv *drv_data, * register to determine the interrupt timer type supported by the hardware. * * Note: This function must only be called when the ATCWDT200 watchdog is - * disabled. If the watchdog is enabled, this function returns TMR_UNKNOWN. + * disabled. If the watchdog is enabled, this function returns -EBUSY. * - * Returns: The interrupt timer type supported by the hardware. + * Returns: 0 on success or negative error code on failure. */ static int atcwdt_get_int_timer_type(struct atcwdt_drv *drv_data) { @@ -274,7 +274,8 @@ static int atcwdt_get_int_timer_type(struct atcwdt_drv *drv_data) regmap_read(drv_data->regmap, REG_CTRL, &val); if (val & CTRL_WDT_EN) { spin_unlock(&drv_data->lock); - return TMR_UNKNOWN; + return dev_err_probe(dev, -EBUSY, + "Watchdog is enabled, cannot detect timer type\n"); } /* |