From 27a72e19dfb566de2188e3d30e6922a78797f9b0 Mon Sep 17 00:00:00 2001
From: Mark Rusk <Mark.Rusk@hp.com>
Date: Tue, 6 Nov 2012 14:33:13 -0600
Subject: [PATCH] --- yaml --- r: 336977 b: refs/heads/master c:
 ebf1b764aa5cb3b4bfe2e96674f1b559f7c37e64 h: refs/heads/master i:   336975:
 760d0cc4ab9341be7cbc28d3f76293666820e607 v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/misc/hpilo.c | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index dee014dace9e..a661fda0ad41 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04bfd1dfb2c0ef236553d205bd95be02792c3396
+refs/heads/master: ebf1b764aa5cb3b4bfe2e96674f1b559f7c37e64
diff --git a/trunk/drivers/misc/hpilo.c b/trunk/drivers/misc/hpilo.c
index 12ccdf94e4fa..b362d938e929 100644
--- a/trunk/drivers/misc/hpilo.c
+++ b/trunk/drivers/misc/hpilo.c
@@ -30,7 +30,7 @@
 
 static struct class *ilo_class;
 static unsigned int ilo_major;
-static unsigned int max_ccb = MIN_CCB;
+static unsigned int max_ccb = 16;
 static char ilo_hwdev[MAX_ILO_DEV];
 
 static inline int get_entry_id(int entry)
@@ -725,6 +725,9 @@ static void ilo_remove(struct pci_dev *pdev)
 	int i, minor;
 	struct ilo_hwinfo *ilo_hw = pci_get_drvdata(pdev);
 
+	if (!ilo_hw)
+		return;
+
 	clear_device(ilo_hw);
 
 	minor = MINOR(ilo_hw->cdev.dev);
@@ -751,9 +754,13 @@ static void ilo_remove(struct pci_dev *pdev)
 static int __devinit ilo_probe(struct pci_dev *pdev,
 			       const struct pci_device_id *ent)
 {
-	int devnum, minor, start, error;
+	int devnum, minor, start, error = 0;
 	struct ilo_hwinfo *ilo_hw;
 
+	/* Ignore subsystem_device = 0x1979 (set by BIOS)  */
+	if (pdev->subsystem_device == 0x1979)
+		goto out;
+
 	if (max_ccb > MAX_CCB)
 		max_ccb = MAX_CCB;
 	else if (max_ccb < MIN_CCB)
@@ -892,14 +899,14 @@ static void __exit ilo_exit(void)
 	class_destroy(ilo_class);
 }
 
-MODULE_VERSION("1.3");
+MODULE_VERSION("1.4");
 MODULE_ALIAS(ILO_NAME);
 MODULE_DESCRIPTION(ILO_NAME);
 MODULE_AUTHOR("David Altobelli <david.altobelli@hp.com>");
 MODULE_LICENSE("GPL v2");
 
 module_param(max_ccb, uint, 0444);
-MODULE_PARM_DESC(max_ccb, "Maximum number of HP iLO channels to attach (8)");
+MODULE_PARM_DESC(max_ccb, "Maximum number of HP iLO channels to attach (16)");
 
 module_init(ilo_init);
 module_exit(ilo_exit);