diff options
| author | Mingarelli, Thomas | 2013-08-09 18:31:09 +0200 |
|---|---|---|
| committer | Wim Van Sebroeck | 2013-10-10 22:23:10 +0200 |
| commit | 0821f20d49d19f49e53b05ef6727e010c4b1f11d (patch) | |
| tree | b4190aa3d36d29720aa8b615548cf3859336862e /drivers/watchdog/hpwdt.c | |
| parent | Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| download | kernel-qcow2-linux-0821f20d49d19f49e53b05ef6727e010c4b1f11d.tar.gz kernel-qcow2-linux-0821f20d49d19f49e53b05ef6727e010c4b1f11d.tar.xz kernel-qcow2-linux-0821f20d49d19f49e53b05ef6727e010c4b1f11d.zip | |
watchdog: hpwdt: Patch to ignore auxilary iLO devices
This patch is to prevent hpwdt from loading on any auxilary iLO devices defined
after the initial (or main) iLO device. All auxilary iLO devices will have a
subsystem device ID set to 0x1979 in order for hpwdt to differentiate between
the two types.
Signed-off-by: Thomas Mingarelli <thomas.mingarelli@hp.com>
Tested-by: Lisa Mitchell <lisa.mitchell@hp.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/hpwdt.c')
| -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", |