* [WATCHDOG] v2.6.32-rc8 fix - rc32434_wdt.c: correct size for ioremap_nocache
@ 2009-12-02 10:16 Wim Van Sebroeck
2009-12-02 13:18 ` [WATCHDOG] v2.6.32-rc8 fix - rc32434_wdt.c: correct size for ioremap_nocache & modulestring Wim Van Sebroeck
0 siblings, 1 reply; 2+ messages in thread
From: Wim Van Sebroeck @ 2009-12-02 10:16 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Andrew Morton, LKML, H Hartley Sweeten
Hi Linus,
Please pull from 'master' branch of
git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
or if master.kernel.org hasn't synced up yet:
master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
This will update the following files:
drivers/watchdog/rc32434_wdt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
with these Changes:
Author: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue Nov 24 21:06:26 2009 -0500
[WATCHDOG] rc32434_wdt.c: use resource_size()
The size value passed to ioremap_nocache() is not correct.
Use resource_size() to get the correct value.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Phil Sutter <n0-1@freewrt.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
The Changes can also be looked at on:
http://www.kernel.org/git/?p=linux/kernel/git/wim/linux-2.6-watchdog.git;a=summary
For completeness, I added the overal diff below.
Greetings,
Wim.
================================================================================
diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c
index f6cccc9..3764af1 100644
--- a/drivers/watchdog/rc32434_wdt.c
+++ b/drivers/watchdog/rc32434_wdt.c
@@ -276,7 +276,7 @@ static int __devinit rc32434_wdt_probe(struct platform_device *pdev)
return -ENODEV;
}
- wdt_reg = ioremap_nocache(r->start, r->end - r->start);
+ wdt_reg = ioremap_nocache(r->start, resource_size(r));
if (!wdt_reg) {
printk(KERN_ERR PFX "failed to remap I/O resources\n");
return -ENXIO;
^ permalink raw reply [flat|nested] 2+ messages in thread* [WATCHDOG] v2.6.32-rc8 fix - rc32434_wdt.c: correct size for ioremap_nocache & modulestring
2009-12-02 10:16 [WATCHDOG] v2.6.32-rc8 fix - rc32434_wdt.c: correct size for ioremap_nocache Wim Van Sebroeck
@ 2009-12-02 13:18 ` Wim Van Sebroeck
0 siblings, 0 replies; 2+ messages in thread
From: Wim Van Sebroeck @ 2009-12-02 13:18 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Andrew Morton, LKML, H Hartley Sweeten, Florian Fainelli
Hi Linus,
> Please pull from 'master' branch of
> git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
> or if master.kernel.org hasn't synced up yet:
> master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
>
> This will update the following files:
>
> drivers/watchdog/rc32434_wdt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Florian had another fix for the rc32434_wdt.c driver.
So this update will consist of:
drivers/watchdog/rc32434_wdt.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
with these Changes:
Author: Florian Fainelli <florian@openwrt.org>
Date: Wed Dec 2 13:21:23 2009 +0100
[PATCH] rc32434_wdt: fix compilation failure
This patch fixes the compilation failure of
rc32434 due to a bad module parameter description.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Author: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue Nov 24 21:06:26 2009 -0500
[WATCHDOG] rc32434_wdt.c: use resource_size()
The size value passed to ioremap_nocache() is not correct.
Use resource_size() to get the correct value.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Phil Sutter <n0-1@freewrt.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
The Changes can also be looked at on:
http://www.kernel.org/git/?p=linux/kernel/git/wim/linux-2.6-watchdog.git;a=summary
For completeness, I added the overal diff below.
Greetings,
Wim.
================================================================================
diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c
index f6cccc9..bf12d06 100644
--- a/drivers/watchdog/rc32434_wdt.c
+++ b/drivers/watchdog/rc32434_wdt.c
@@ -62,7 +62,7 @@ extern unsigned int idt_cpu_freq;
static int timeout = WATCHDOG_TIMEOUT;
module_param(timeout, int, 0);
MODULE_PARM_DESC(timeout, "Watchdog timeout value, in seconds (default="
- WATCHDOG_TIMEOUT ")");
+ __MODULE_STRING(WATCHDOG_TIMEOUT) ")");
static int nowayout = WATCHDOG_NOWAYOUT;
module_param(nowayout, int, 0);
@@ -276,7 +276,7 @@ static int __devinit rc32434_wdt_probe(struct platform_device *pdev)
return -ENODEV;
}
- wdt_reg = ioremap_nocache(r->start, r->end - r->start);
+ wdt_reg = ioremap_nocache(r->start, resource_size(r));
if (!wdt_reg) {
printk(KERN_ERR PFX "failed to remap I/O resources\n");
return -ENXIO;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-12-02 13:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-12-02 10:16 [WATCHDOG] v2.6.32-rc8 fix - rc32434_wdt.c: correct size for ioremap_nocache Wim Van Sebroeck
2009-12-02 13:18 ` [WATCHDOG] v2.6.32-rc8 fix - rc32434_wdt.c: correct size for ioremap_nocache & modulestring Wim Van Sebroeck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®