Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[linux-2.6-omap-h63xx.git] / drivers / infiniband / ulp / iser / iser_verbs.c

diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c
index d42ec0156eec7bb215317ea649a8140da451785a..714b8db02b297b48c37abd37f1fc13891c2cbcaa 100644 (file)
--- a/drivers/infiniband/ulp/iser/iser_verbs.c
+++ b/drivers/infiniband/ulp/iser/iser_verbs.c
@@ -32,7 +32,6 @@
  *
  * $Id: iser_verbs.c 7051 2006-05-10 12:29:11Z ogerlitz $
  */
-#include <asm/io.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/delay.h>
@@ -106,7 +105,7 @@ pd_err:
 }
 
 /**
- * iser_free_device_ib_res - destory/dealloc/dereg the DMA MR,
+ * iser_free_device_ib_res - destroy/dealloc/dereg the DMA MR,
  * CQ and PD created with the device associated with the adapator.
  */
 static void iser_free_device_ib_res(struct iser_device *device)
@@ -476,13 +475,11 @@ static int iser_cma_handler(struct rdma_cm_id *cma_id, struct rdma_cm_event *eve
                iser_disconnected_handler(cma_id);
                break;
        case RDMA_CM_EVENT_DEVICE_REMOVAL:
+               iser_err("Device removal is currently unsupported\n");
                BUG();
                break;
-       case RDMA_CM_EVENT_CONNECT_RESPONSE:
-               BUG();
-               break;
-       case RDMA_CM_EVENT_CONNECT_REQUEST:
        default:
+               iser_err("Unexpected RDMA CM event (%d)\n", event->event);
                break;
        }
        return ret;