Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+5
-4
+1
-1
drivers/watchdog/kempld_wdt.c
+1
-1
drivers/watchdog/kempld_wdt.c
···
35
35
#define KEMPLD_WDT_STAGE_TIMEOUT(x) (0x1b + (x) * 4)
36
36
#define KEMPLD_WDT_STAGE_CFG(x) (0x18 + (x))
37
37
#define STAGE_CFG_GET_PRESCALER(x) (((x) & 0x30) >> 4)
38
-
#define STAGE_CFG_SET_PRESCALER(x) (((x) & 0x30) << 4)
38
+
#define STAGE_CFG_SET_PRESCALER(x) (((x) & 0x3) << 4)
39
39
#define STAGE_CFG_PRESCALER_MASK 0x30
40
40
#define STAGE_CFG_ACTION_MASK 0x7
41
41
#define STAGE_CFG_ASSERT (1 << 3)
+2
-2
drivers/watchdog/sunxi_wdt.c
+2
-2
drivers/watchdog/sunxi_wdt.c
···
146
146
.set_timeout = sunxi_wdt_set_timeout,
147
147
};
148
148
149
-
static int __init sunxi_wdt_probe(struct platform_device *pdev)
149
+
static int sunxi_wdt_probe(struct platform_device *pdev)
150
150
{
151
151
struct sunxi_wdt_dev *sunxi_wdt;
152
152
struct resource *res;
···
187
187
return 0;
188
188
}
189
189
190
-
static int __exit sunxi_wdt_remove(struct platform_device *pdev)
190
+
static int sunxi_wdt_remove(struct platform_device *pdev)
191
191
{
192
192
struct sunxi_wdt_dev *sunxi_wdt = platform_get_drvdata(pdev);
193
193