diff options
| author | John Crispin <john@openwrt.org> | 2011-11-03 15:15:52 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2011-11-03 15:15:52 +0000 |
| commit | ea36ad76bcf0043d137da37ea1aee7bded76f5a2 (patch) | |
| tree | f75ee0417c813ac599e78048c15bdd5f4ffacb82 /target/linux/lantiq/patches-3.0/0003-MIPS-lantiq-fix-watchdogs-timeout-handling.patch | |
| parent | d8722fac7046020715c41106df28371f3f521132 (diff) | |
| download | upstream-ea36ad76bcf0043d137da37ea1aee7bded76f5a2.tar.gz upstream-ea36ad76bcf0043d137da37ea1aee7bded76f5a2.tar.bz2 upstream-ea36ad76bcf0043d137da37ea1aee7bded76f5a2.zip | |
lantiq: bump to 3.1
SVN-Revision: 28721
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, 0 insertions, 45 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 deleted file mode 100644 index 5d0061acaa..0000000000 --- a/target/linux/lantiq/patches-3.0/0003-MIPS-lantiq-fix-watchdogs-timeout-handling.patch +++ /dev/null @@ -1,45 +0,0 @@ -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 - |