hpilo: open/close fix - commit c073b2db006ba9370be1eecc36a1be1d9ce31310 - included in 2.6.29

commit c073b2db006ba9370be1eecc36a1be1d9ce31310
Author: David Altobelli <email address hidden>
Date: Wed Feb 4 15:11:58 2009 -0800

    hpilo: open/close fix

    The device can take a while to respond to an open/close request, so
    increase the time kernel will wait for response (1 ms to 10ms).

    Also, properly clean up a channel on a failed open, by calling the channel
    close routine. Just freeing the memory isn't sufficient, the device needs
    to be informed that the channel is no longer open, and the device memory
    cleared of references to freed dma buffer.

    Signed-off-by: David Altobelli <email address hidden>
    Cc: Greg KH <email address hidden>
    Signed-off-by: Andrew Morton <email address hidden>
    Signed-off-by: Linus Torvalds <email address hidden>

diff --git a/drivers/misc/hpilo.c b/drivers/misc/hpilo.c
index 10c421b..f26667a 100644
--- a/drivers/misc/hpilo.c
+++ b/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/drivers/misc/hpilo.h b/drivers/misc/hpilo.h
index a281207..b64a20e 100644
--- a/drivers/misc/hpilo.h
+++ b/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.