Merge tag 'gcc-plugins-v4.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / drivers / watchdog / hpwdt.c

diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index 8f89bd8..70c7194 100644 (file)
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -39,7 +39,7 @@
 #include <asm/nmi.h>
 #include <asm/frame.h>
 
-#define HPWDT_VERSION                  "1.3.3"
+#define HPWDT_VERSION                  "1.4.0"
 #define SECS_TO_TICKS(secs)            ((secs) * 1000 / 128)
 #define TICKS_TO_SECS(ticks)           ((ticks) * 128 / 1000)
 #define HPWDT_MAX_TIMER                        TICKS_TO_SECS(65535)
@@ -814,7 +814,8 @@ static int hpwdt_init_one(struct pci_dev *dev,
         * not run on a legacy ASM box.
         * So we only support the G5 ProLiant servers and higher.
         */
-       if (dev->subsystem_vendor != PCI_VENDOR_ID_HP) {
+       if (dev->subsystem_vendor != PCI_VENDOR_ID_HP &&
+           dev->subsystem_vendor != PCI_VENDOR_ID_HP_3PAR) {
                dev_warn(&dev->dev,
                        "This server does not have an iLO2+ ASIC.\n");
                return -ENODEV;
@@ -823,7 +824,8 @@ static int hpwdt_init_one(struct pci_dev *dev,
        /*
         * Ignore all auxilary iLO devices with the following PCI ID
         */
-       if (dev->subsystem_device == 0x1979)
+       if (dev->subsystem_vendor == PCI_VENDOR_ID_HP &&
+           dev->subsystem_device == 0x1979)
                return -ENODEV;
 
        if (pci_enable_device(dev)) {