From eb918193d40c201a7a476d2fefae2c57510c74d8 Mon Sep 17 00:00:00 2001
From: David Altobelli <david.altobelli@hp.com>
Date: Wed, 4 Feb 2009 15:11:58 -0800
Subject: [PATCH] --- yaml --- r: 130960 b: refs/heads/master c:
 c073b2db006ba9370be1eecc36a1be1d9ce31310 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/misc/hpilo.c | 6 +++---
 trunk/drivers/misc/hpilo.h | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c324dd84b902..242144c3301f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58763a297405024d23d8f1d0bba3e6603660c4b6
+refs/heads/master: c073b2db006ba9370be1eecc36a1be1d9ce31310
diff --git a/trunk/drivers/misc/hpilo.c b/trunk/drivers/misc/hpilo.c
index 10c421b73eaf..f26667a7abf7 100644
--- a/trunk/drivers/misc/hpilo.c
+++ b/trunk/drivers/misc/hpilo.c
@@ -207,7 +207,7 @@ static void ilo_ccb_close(struct pci_dev *pdev, struct ccb_data *data)
 		  &device_ccb->recv_ctrl);
 
 	/* give iLO some time to process stop request */
-	for (retries = 1000; retries > 0; retries--) {
+	for (retries = MAX_WAIT; retries > 0; retries--) {
 		doorbell_set(driver_ccb);
 		udelay(1);
 		if (!(ioread32(&device_ccb->send_ctrl) & (1 << CTRL_BITPOS_A))
@@ -309,7 +309,7 @@ static int ilo_ccb_open(struct ilo_hwinfo *hw, struct ccb_data *data, int slot)
 	doorbell_clr(driver_ccb);
 
 	/* make sure iLO is really handling requests */
-	for (i = 1000; i > 0; i--) {
+	for (i = MAX_WAIT; i > 0; i--) {
 		if (ilo_pkt_dequeue(hw, driver_ccb, SENDQ, &pkt_id, NULL, NULL))
 			break;
 		udelay(1);
@@ -326,7 +326,7 @@ static int ilo_ccb_open(struct ilo_hwinfo *hw, struct ccb_data *data, int slot)
 
 	return 0;
 free:
-	pci_free_consistent(pdev, data->dma_size, data->dma_va, data->dma_pa);
+	ilo_ccb_close(pdev, data);
 out:
 	return error;
 }
diff --git a/trunk/drivers/misc/hpilo.h b/trunk/drivers/misc/hpilo.h
index a281207696c1..b64a20ef07e3 100644
--- a/trunk/drivers/misc/hpilo.h
+++ b/trunk/drivers/misc/hpilo.h
@@ -19,6 +19,8 @@
 #define MAX_ILO_DEV	1
 /* max number of files */
 #define MAX_OPEN	(MAX_CCB * MAX_ILO_DEV)
+/* spin counter for open/close delay */
+#define MAX_WAIT	10000
 
 /*
  * Per device, used to track global memory allocations.