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

Commit 868f480b 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:
 "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
parents 6d77987f b232a70a

drivers/watchdog/hpwdt.c

+3 −0
Original line number Diff line number Diff line
@@ -814,6 +814,9 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev, 
	hpwdt_timer_reg = pci_mem_addr + 0x70;

	hpwdt_timer_con = pci_mem_addr + 0x72;



	/* Make sure that timer is disabled until /dev/watchdog is opened */

	hpwdt_stop();



	/* Make sure that we have a valid soft_margin */

	if (hpwdt_change_timer(soft_margin))

		hpwdt_change_timer(DEFAULT_MARGIN);

drivers/watchdog/watchdog_core.c

+2 −1
Original line number Diff line number Diff line
@@ -128,11 +128,12 @@ EXPORT_SYMBOL_GPL(watchdog_register_device); 
void watchdog_unregister_device(struct watchdog_device *wdd)

{

	int ret;

	int devno = wdd->cdev.dev;

	int devno;



	if (wdd == NULL)

		return;



	devno = wdd->cdev.dev;

	ret = watchdog_dev_unregister(wdd);

	if (ret)

		pr_err("error unregistering /dev/watchdog (err=%d)\n", ret);