The patch titled
improve machzwd detection
has been added to the -mm tree. Its filename is
improve-machzwd-detection.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: improve machzwd detection
From: Dave Jones <davej@xxxxxxxxxx>
On a machine with no machzwd, loading the module prints out..
machzwd: MachZ ZF-Logic Watchdog driver initializing.
0xffff
machzwd: Watchdog using action = RESET
- the 0xffff printk is unnecessary
- 0xffff seems to be 'hardware not present'
- fix CodingStyle. (This driver could use some more work here)
Signed-off-by: Dave Jones <davej@xxxxxxxxxx>
Cc: Wim Van Sebroeck <wim@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
diff -puN drivers/char/watchdog/machzwd.c~improve-machzwd-detection drivers/char/watchdog/machzwd.c
--- a/drivers/char/watchdog/machzwd.c~improve-machzwd-detection
+++ a/drivers/char/watchdog/machzwd.c
@@ -426,8 +426,7 @@ static int __init zf_init(void)
printk(KERN_INFO PFX ": MachZ ZF-Logic Watchdog driver initializing.\n");
ret = zf_get_ZFL_version();
- printk("%#x\n", ret);
- if((!ret) || (ret != 0xffff)){
+ if ((!ret) || (ret == 0xffff)) {
printk(KERN_WARNING PFX ": no ZF-Logic found\n");
return -ENODEV;
}
_
Patches currently in -mm which might be from davej@xxxxxxxxxx are
git-agpgart.patch
git-cpufreq.patch
remove-null-chars-from-dvb-names.patch
remove-silly-messages-from-input-layer.patch
git-kbuild.patch
via-sata-oops-on-init.patch
tickle-nmi-watchdog-on-serial-output.patch
improve-machzwd-detection.patch
debug-variants-of-linked-list-macros.patch
tty_ioc-keep-davej-sane.patch
sched-dont-print-migration-cost-when-only-1-cpu.patch
fbcon-use-persistent-allocation-for-cursor-blinking.patch
post-halloween-doc.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
