Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 786c58b7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1eafbfeb b77b7088

drivers/watchdog/cpwd.c

+1 −1
Original line number Diff line number Diff line
@@ -646,7 +646,7 @@ static int __devexit cpwd_remove(struct platform_device *op) 
	struct cpwd *p = dev_get_drvdata(&op->dev);

	int i;



	for (i = 0; i < 4; i++) {

	for (i = 0; i < WD_NUMDEVS; i++) {

		misc_deregister(&p->devs[i].misc);



		if (!p->enabled) {

drivers/watchdog/hpwdt.c

+2 −2
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ static int __devinit hpwdt_init_nmi_decoding(struct pci_dev *dev) 
	return 0;

}



static void __devexit hpwdt_exit_nmi_decoding(void)

static void hpwdt_exit_nmi_decoding(void)

{

	unregister_die_notifier(&die_notifier);

	if (cru_rom_addr)
@@ -726,7 +726,7 @@ static int __devinit hpwdt_init_nmi_decoding(struct pci_dev *dev) 
	return 0;

}



static void __devexit hpwdt_exit_nmi_decoding(void)

static void hpwdt_exit_nmi_decoding(void)

{

}

#endif /* CONFIG_HPWDT_NMI_DECODING */

drivers/watchdog/sch311x_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ static int __init sch311x_detect(int sio_config_port, unsigned short *addr) 
	sch311x_sio_outb(sio_config_port, 0x07, 0x0a);



	/* Check if Logical Device Register is currently active */

	if (sch311x_sio_inb(sio_config_port, 0x30) && 0x01 == 0)

	if ((sch311x_sio_inb(sio_config_port, 0x30) & 0x01) == 0)

		printk(KERN_INFO PFX "Seems that LDN 0x0a is not active...\n");



	/* Get the base address of the runtime registers */

drivers/watchdog/w83697ug_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static int w83697ug_select_wd_register(void) 
	outb_p(0x08, WDT_EFDR); /* select logical device 8 (GPIO2) */

	outb_p(0x30, WDT_EFER); /* select CR30 */

	c = inb_p(WDT_EFDR);

	outb_p(c || 0x01, WDT_EFDR); /* set bit 0 to activate GPIO2 */

	outb_p(c | 0x01, WDT_EFDR); /* set bit 0 to activate GPIO2 */



	return 0;

}