Commit f112bf85 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull watchdog fix from Wim Van Sebroeck:
 "Make sure that the hpwdt driver will not load auxilary iLO devices"

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: hpwdt: Patch to ignore auxilary iLO devices
parents 0ff18e37 0821f20d

drivers/watchdog/hpwdt.c

+6 −0
Original line number Diff line number Diff line
@@ -802,6 +802,12 @@ static int hpwdt_init_one(struct pci_dev *dev, 
		return -ENODEV;

	}



	/*

	 * Ignore all auxilary iLO devices with the following PCI ID

	 */

	if (dev->subsystem_device == 0x1979)

		return -ENODEV;



	if (pci_enable_device(dev)) {

		dev_warn(&dev->dev,

			"Not possible to enable PCI Device: 0x%x:0x%x.\n",