From dfffaea839fd631ec0b3d4f58540316a04c4f2ad Mon Sep 17 00:00:00 2001 From: blogic Date: Thu, 3 Nov 2011 15:15:52 +0000 Subject: lantiq: bump to 3.1 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28721 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ...IPS-lantiq-fix-watchdogs-timeout-handling.patch | 45 ---------------------- 1 file changed, 45 deletions(-) delete mode 100644 target/linux/lantiq/patches-3.0/0003-MIPS-lantiq-fix-watchdogs-timeout-handling.patch (limited to 'target/linux/lantiq/patches-3.0/0003-MIPS-lantiq-fix-watchdogs-timeout-handling.patch') 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 5d0061aca..000000000 --- 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 -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 -Signed-off-by: Thomas Langer -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 - -- cgit v1.2.3