Merge git://www.linux-watchdog.org/linux-watchdog
Pull watchdog fixes from Wim Van Sebroeck: "This fixes: - the WDIOC_GETSTATUS return value - the unregister of all NMI events on exit - the loading of the iTCO_wdt driver after the conversion to the lpc_ich mfd model." * git://www.linux-watchdog.org/linux-watchdog: watchdog: core: fix WDIOC_GETSTATUS return value watchdog: hpwdt: Unregister NMI events on exit. watchdog: iTCO_wdt: add platform driver module alias
This commit is contained in:
commit
ccce27c0fe
|
@ -146,7 +146,7 @@ struct cmn_registers {
|
|||
} __attribute__((packed));
|
||||
|
||||
static unsigned int hpwdt_nmi_decoding;
|
||||
static unsigned int allow_kdump;
|
||||
static unsigned int allow_kdump = 1;
|
||||
static unsigned int is_icru;
|
||||
static DEFINE_SPINLOCK(rom_lock);
|
||||
static void *cru_rom_addr;
|
||||
|
@ -756,6 +756,8 @@ error:
|
|||
static void hpwdt_exit_nmi_decoding(void)
|
||||
{
|
||||
unregister_nmi_handler(NMI_UNKNOWN, "hpwdt");
|
||||
unregister_nmi_handler(NMI_SERR, "hpwdt");
|
||||
unregister_nmi_handler(NMI_IO_CHECK, "hpwdt");
|
||||
if (cru_rom_addr)
|
||||
iounmap(cru_rom_addr);
|
||||
}
|
||||
|
|
|
@ -699,3 +699,4 @@ MODULE_DESCRIPTION("Intel TCO WatchDog Timer Driver");
|
|||
MODULE_VERSION(DRV_VERSION);
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
|
||||
MODULE_ALIAS("platform:" DRV_NAME);
|
||||
|
|
|
@ -349,7 +349,7 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,
|
|||
sizeof(struct watchdog_info)) ? -EFAULT : 0;
|
||||
case WDIOC_GETSTATUS:
|
||||
err = watchdog_get_status(wdd, &val);
|
||||
if (err)
|
||||
if (err == -ENODEV)
|
||||
return err;
|
||||
return put_user(val, p);
|
||||
case WDIOC_GETBOOTSTATUS:
|
||||
|
|
Loading…
Reference in New Issue