Commit 786c58b7275ae885a3cee9d5bcf8721d962861ac
Exists in
master
and in
39 other branches
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: watchdog: hpwdt: eliminate section mismatch warning watchdog: w83697ug_wdt: Fix set bit 0 to activate GPIO2 watchdog: sch311x_wdt: fix printk condition watchdog: sch311x_wdt: Fix LDN active check watchdog: cpwd: Fix buffer-overflow
Showing 4 changed files Side-by-side Diff
drivers/watchdog/cpwd.c
drivers/watchdog/hpwdt.c
... | ... | @@ -710,7 +710,7 @@ |
710 | 710 | return 0; |
711 | 711 | } |
712 | 712 | |
713 | -static void __devexit hpwdt_exit_nmi_decoding(void) | |
713 | +static void hpwdt_exit_nmi_decoding(void) | |
714 | 714 | { |
715 | 715 | unregister_die_notifier(&die_notifier); |
716 | 716 | if (cru_rom_addr) |
... | ... | @@ -726,7 +726,7 @@ |
726 | 726 | return 0; |
727 | 727 | } |
728 | 728 | |
729 | -static void __devexit hpwdt_exit_nmi_decoding(void) | |
729 | +static void hpwdt_exit_nmi_decoding(void) | |
730 | 730 | { |
731 | 731 | } |
732 | 732 | #endif /* CONFIG_HPWDT_NMI_DECODING */ |
drivers/watchdog/sch311x_wdt.c
... | ... | @@ -508,7 +508,7 @@ |
508 | 508 | sch311x_sio_outb(sio_config_port, 0x07, 0x0a); |
509 | 509 | |
510 | 510 | /* Check if Logical Device Register is currently active */ |
511 | - if (sch311x_sio_inb(sio_config_port, 0x30) && 0x01 == 0) | |
511 | + if ((sch311x_sio_inb(sio_config_port, 0x30) & 0x01) == 0) | |
512 | 512 | printk(KERN_INFO PFX "Seems that LDN 0x0a is not active...\n"); |
513 | 513 | |
514 | 514 | /* Get the base address of the runtime registers */ |
drivers/watchdog/w83697ug_wdt.c
... | ... | @@ -109,7 +109,7 @@ |
109 | 109 | outb_p(0x08, WDT_EFDR); /* select logical device 8 (GPIO2) */ |
110 | 110 | outb_p(0x30, WDT_EFER); /* select CR30 */ |
111 | 111 | c = inb_p(WDT_EFDR); |
112 | - outb_p(c || 0x01, WDT_EFDR); /* set bit 0 to activate GPIO2 */ | |
112 | + outb_p(c | 0x01, WDT_EFDR); /* set bit 0 to activate GPIO2 */ | |
113 | 113 | |
114 | 114 | return 0; |
115 | 115 | } |