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:
"Fix a kdump issue in hpwdt and a possible NULL dereference."
* git://www.linux-watchdog.org/linux-watchdog:
watchdog: move the dereference below the NULL test
hpwdt: Fix kdump issue in hpwdt
+5
-1
+3
drivers/watchdog/hpwdt.c
+3
drivers/watchdog/hpwdt.c
···
814
814
hpwdt_timer_reg = pci_mem_addr + 0x70;
815
815
hpwdt_timer_con = pci_mem_addr + 0x72;
816
816
817
+
/* Make sure that timer is disabled until /dev/watchdog is opened */
818
+
hpwdt_stop();
819
+
817
820
/* Make sure that we have a valid soft_margin */
818
821
if (hpwdt_change_timer(soft_margin))
819
822
hpwdt_change_timer(DEFAULT_MARGIN);
+2
-1
drivers/watchdog/watchdog_core.c
+2
-1
drivers/watchdog/watchdog_core.c
···
128
128
void watchdog_unregister_device(struct watchdog_device *wdd)
129
129
{
130
130
int ret;
131
-
int devno = wdd->cdev.dev;
131
+
int devno;
132
132
133
133
if (wdd == NULL)
134
134
return;
135
135
136
+
devno = wdd->cdev.dev;
136
137
ret = watchdog_dev_unregister(wdd);
137
138
if (ret)
138
139
pr_err("error unregistering /dev/watchdog (err=%d)\n", ret);