diff options
| author | John Crispin <john@openwrt.org> | 2011-10-10 15:13:46 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2011-10-10 15:13:46 +0000 |
| commit | 0a866293bd9e204978c995cb0545c20f8ab63c7e (patch) | |
| tree | 7d7a9ef25035a4afd4b371b85506fe062bac125a /target/linux/lantiq/patches-3.0/0003-MIPS-lantiq-fix-watchdogs-timeout-handling.patch | |
| parent | 1359fe4fcf0a6cef3eced837d63c866cc75a52fc (diff) | |
| download | upstream-0a866293bd9e204978c995cb0545c20f8ab63c7e.tar.gz upstream-0a866293bd9e204978c995cb0545c20f8ab63c7e.tar.bz2 upstream-0a866293bd9e204978c995cb0545c20f8ab63c7e.zip | |
* update patches to 3.0
* add basic vr9 support
* backport 3.1 fixes
* backport 3.2 queue (falcon)
SVN-Revision: 28405
Diffstat (limited to 'target/linux/lantiq/patches-3.0/0003-MIPS-lantiq-fix-watchdogs-timeout-handling.patch')
| -rw-r--r-- | target/linux/lantiq/patches-3.0/0003-MIPS-lantiq-fix-watchdogs-timeout-handling.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/target/linux/lantiq/patches-3.0/0003-MIPS-lantiq-fix-watchdogs-timeout-handling.patch b/target/linux/lantiq/patches-3.0/0003-MIPS-lantiq-fix-watchdogs-timeout-handling.patch new file mode 100644 index 0000000000..5d0061acaa --- /dev/null +++ b/target/linux/lantiq/patches-3.0/0003-MIPS-lantiq-fix-watchdogs-timeout-handling.patch @@ -0,0 +1,45 @@ +From 14ea48a5f5702ddc97425cbe520600e187e14e4a Mon Sep 17 00:00:00 2001 +From: John Crispin <blogic@openwrt.org> +Date: Thu, 11 Aug 2011 13:58:39 +0200 +Subject: [PATCH 03/24] MIPS: lantiq: fix watchdogs timeout handling + +The enable function was using the global timeout variable for local operations. +This resulted in the value of the global variable being corrupted, thus +breaking the code. + +Signed-off-by: John Crispin <blogic@openwrt.org> +Signed-off-by: Thomas Langer <thomas.langer@lantiq.com> +Cc: linux-watchdog@vger.kernel.org +Cc: linux-mips@linux-mips.org +--- + drivers/watchdog/lantiq_wdt.c | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/watchdog/lantiq_wdt.c b/drivers/watchdog/lantiq_wdt.c +index 7d82ada..102aed0 100644 +--- a/drivers/watchdog/lantiq_wdt.c ++++ b/drivers/watchdog/lantiq_wdt.c +@@ -51,16 +51,16 @@ static int ltq_wdt_ok_to_close; + static void + ltq_wdt_enable(void) + { +- ltq_wdt_timeout = ltq_wdt_timeout * ++ unsigned long int timeout = ltq_wdt_timeout * + (ltq_io_region_clk_rate / LTQ_WDT_DIVIDER) + 0x1000; +- if (ltq_wdt_timeout > LTQ_MAX_TIMEOUT) +- ltq_wdt_timeout = LTQ_MAX_TIMEOUT; ++ if (timeout > LTQ_MAX_TIMEOUT) ++ timeout = LTQ_MAX_TIMEOUT; + + /* write the first password magic */ + ltq_w32(LTQ_WDT_PW1, ltq_wdt_membase + LTQ_WDT_CR); + /* write the second magic plus the configuration and new timeout */ + ltq_w32(LTQ_WDT_SR_EN | LTQ_WDT_SR_PWD | LTQ_WDT_SR_CLKDIV | +- LTQ_WDT_PW2 | ltq_wdt_timeout, ltq_wdt_membase + LTQ_WDT_CR); ++ LTQ_WDT_PW2 | timeout, ltq_wdt_membase + LTQ_WDT_CR); + } + + static void +-- +1.7.5.4 + |