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

f112bf85 · Linus Torvalds <[email protected]> · 2013-10-10 13:57:10 -07:00

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

Commit: f112bf8585b9ce4e3cce2eee6b8319eb9fee3ec1
Parents: 0ff18e37 · 0821f20d

Merge commit. Changes below are compared with the first parent: 0ff18e37.

Changes

1 files changed · +6 −0

File	Status	Add	Del	Content
drivers/watchdog/hpwdt.c	modified	+6	−0	View file

drivers/watchdog/hpwdt.c

View file

diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index 5be5e3d..19f3c3f 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -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",