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

Commit b690a377 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] w83627hf_wdt.c: add support for the W83627EHF support
  [WATCHDOG] SA1100 watchdog maximum timeout
  [WATCHDOG] w83697ug, fix lock imbalance
  [WATCHDOG] drivers/watchdog/bcm47xx_wdt.c: Remove unnecessary semicolons
parents 016d3569 cf1eaab2

drivers/watchdog/bcm47xx_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static long bcm47xx_wdt_ioctl(struct file *file, 
{

	void __user *argp = (void __user *)arg;

	int __user *p = argp;

	int new_value, retval = -EINVAL;;

	int new_value, retval = -EINVAL;



	switch (cmd) {

	case WDIOC_GETSUPPORT:

drivers/watchdog/sa1100_wdt.c

+3 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 


static unsigned long oscr_freq;

static unsigned long sa1100wdt_users;

static int pre_margin;

static unsigned int pre_margin;

static int boot_status;



/*
@@ -84,6 +84,7 @@ static const struct watchdog_info ident = { 
	.options	= WDIOF_CARDRESET | WDIOF_SETTIMEOUT

				| WDIOF_KEEPALIVEPING,

	.identity	= "SA1100/PXA255 Watchdog",

	.firmware_version	= 1,

};



static long sa1100dog_ioctl(struct file *file, unsigned int cmd,
@@ -118,7 +119,7 @@ static long sa1100dog_ioctl(struct file *file, unsigned int cmd, 
		if (ret)

			break;



		if (time <= 0 || time > 255) {

		if (time <= 0 || (oscr_freq * (long long)time >= 0xffffffff)) {

			ret = -EINVAL;

			break;

		}

drivers/watchdog/w83627hf_wdt.c

+5 −0
Original line number Diff line number Diff line
@@ -89,6 +89,11 @@ static void w83627hf_select_wd_register(void) 
		c = ((inb_p(WDT_EFDR) & 0xf7) | 0x04); /* select WDT0 */

		outb_p(0x2b, WDT_EFER);

		outb_p(c, WDT_EFDR);	/* set GPIO3 to WDT0 */

	} else if (c == 0x88) {	/* W83627EHF */

		outb_p(0x2d, WDT_EFER); /* select GPIO5 */

		c = inb_p(WDT_EFDR) & ~0x01; /* PIN77 -> WDT0# */

		outb_p(0x2d, WDT_EFER);

		outb_p(c, WDT_EFDR); /* set GPIO5 to WDT0 */

	}



	outb_p(0x07, WDT_EFER); /* point to logical device number reg */

drivers/watchdog/w83697ug_wdt.c

+3 −1
Original line number Diff line number Diff line
@@ -149,8 +149,10 @@ static void wdt_ctrl(int timeout) 
{

	spin_lock(&io_lock);



	if (w83697ug_select_wd_register() < 0)

	if (w83697ug_select_wd_register() < 0) {

		spin_unlock(&io_lock);

		return;

	}



	outb_p(0xF4, WDT_EFER);    /* Select CRF4 */

	outb_p(timeout, WDT_EFDR); /* Write Timeout counter to CRF4 */