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

Commit 73cac03d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://www.linux-watchdog.org/linux-watchdog 

Pull watchdog fixes from Wim Van Sebroeck:
 "This will fix a deadlock on the ts72xx_wdt driver, fix bitmasks in the
  kempld_wdt driver and fix a section mismatch in the sunxi_wdt driver"

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: sunxi: Fix section mismatch
  watchdog: kempld_wdt: Fix bit mask definition
  watchdog: ts72xx_wdt: locking bug in ioctl
parents 3552570a 1d5898b4

drivers/watchdog/kempld_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#define KEMPLD_WDT_STAGE_TIMEOUT(x)	(0x1b + (x) * 4)

#define KEMPLD_WDT_STAGE_CFG(x)		(0x18 + (x))

#define STAGE_CFG_GET_PRESCALER(x)	(((x) & 0x30) >> 4)

#define STAGE_CFG_SET_PRESCALER(x)	(((x) & 0x30) << 4)

#define STAGE_CFG_SET_PRESCALER(x)	(((x) & 0x3) << 4)

#define STAGE_CFG_PRESCALER_MASK	0x30

#define STAGE_CFG_ACTION_MASK		0x7

#define STAGE_CFG_ASSERT		(1 << 3)

drivers/watchdog/sunxi_wdt.c

+2 −2
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static const struct watchdog_ops sunxi_wdt_ops = { 
	.set_timeout	= sunxi_wdt_set_timeout,

};



static int __init sunxi_wdt_probe(struct platform_device *pdev)

static int sunxi_wdt_probe(struct platform_device *pdev)

{

	struct sunxi_wdt_dev *sunxi_wdt;

	struct resource *res;
@@ -187,7 +187,7 @@ static int __init sunxi_wdt_probe(struct platform_device *pdev) 
	return 0;

}



static int __exit sunxi_wdt_remove(struct platform_device *pdev)

static int sunxi_wdt_remove(struct platform_device *pdev)

{

	struct sunxi_wdt_dev *sunxi_wdt = platform_get_drvdata(pdev);

drivers/watchdog/ts72xx_wdt.c

+2 −1
Original line number Diff line number Diff line
@@ -310,7 +310,8 @@ static long ts72xx_wdt_ioctl(struct file *file, unsigned int cmd, 


	case WDIOC_GETSTATUS:

	case WDIOC_GETBOOTSTATUS:

		return put_user(0, p);

		error = put_user(0, p);

		break;



	case WDIOC_KEEPALIVE:

		ts72xx_wdt_kick(wdt);