Merge branch 'task_killable' of git://git.kernel.org/pub/scm/linux/kernel/git/willy...

[linux-2.6-omap-h63xx.git] / drivers / infiniband / hw / ehca / ehca_sqp.c

diff --git a/drivers/infiniband/hw/ehca/ehca_sqp.c b/drivers/infiniband/hw/ehca/ehca_sqp.c
index 9f16e9c79394e5ac9b1b9883c8128302a909883e..79e72b25b252f33fd6d1d6d5c1ac18b1e12969bd 100644 (file)
--- a/drivers/infiniband/hw/ehca/ehca_sqp.c
+++ b/drivers/infiniband/hw/ehca/ehca_sqp.c
@@ -40,11 +40,8 @@
  */
 
 
-#include <linux/module.h>
-#include <linux/err.h>
 #include "ehca_classes.h"
 #include "ehca_tools.h"
-#include "ehca_qes.h"
 #include "ehca_iverbs.h"
 #include "hcp_if.h"
 
@@ -82,7 +79,7 @@ u64 ehca_define_sqp(struct ehca_shca *shca,
 
                if (ret != H_SUCCESS) {
                        ehca_err(&shca->ib_device,
-                                "Can't define AQP1 for port %x. rc=%lx",
+                                "Can't define AQP1 for port %x. h_ret=%li",
                                 port, ret);
                        return ret;
                }
@@ -93,6 +90,9 @@ u64 ehca_define_sqp(struct ehca_shca *shca,
                return H_PARAMETER;
        }
 
+       if (ehca_nr_ports < 0) /* autodetect mode */
+               return H_SUCCESS;
+
        for (counter = 0;
             shca->sport[port - 1].port_state != IB_PORT_ACTIVE &&
                     counter < ehca_port_act_time;