diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-10 13:57:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-10 13:57:10 -0700 |
| commit | f112bf8585b9ce4e3cce2eee6b8319eb9fee3ec1 (patch) | |
| tree | 8792159f0212c3b296c5894f85f68b9d443672b0 | |
| parent | 0ff18e3734c248fa516b4be942b1196832ee936c (diff) | |
| parent | 0821f20d49d19f49e53b05ef6727e010c4b1f11d (diff) | |
| download | linux-f112bf8585b9ce4e3cce2eee6b8319eb9fee3ec1.tar.bz2 | |
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
| -rw-r--r-- | drivers/watchdog/hpwdt.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index 5be5e3d14f79..19f3c3fc65f4 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", |