diff options
author | Dave Jones <davej@redhat.com> | 2006-08-01 20:06:43 +0200 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2006-10-02 23:14:38 +0200 |
commit | 11dc10195aed0636d9a60907594b349424b933a7 (patch) | |
tree | 81422a8b5e443eddc30ab67806d4442bdc032cff /drivers | |
parent | 795b89d207d8ff5397f9ff1f4d44662aa7c821fc (diff) | |
download | op-kernel-dev-11dc10195aed0636d9a60907594b349424b933a7.zip op-kernel-dev-11dc10195aed0636d9a60907594b349424b933a7.tar.gz |
[WATCHDOG] improve machzwd detection
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@redhat.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/watchdog/machzwd.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/watchdog/machzwd.c b/drivers/char/watchdog/machzwd.c index ed2b6e1..276577d 100644 --- a/drivers/char/watchdog/machzwd.c +++ b/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; } |