In iser_connect_release there is no chance that the iser device is set to NULL, if this happens we have a BUG. So use BUG_ON.
Signed-off-by: Sagi Grimberg <[email protected]> --- drivers/infiniband/ulp/isert/ib_isert.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c index 97cee96..357d481 100644 --- a/drivers/infiniband/ulp/isert/ib_isert.c +++ b/drivers/infiniband/ulp/isert/ib_isert.c @@ -797,7 +797,9 @@ isert_connect_release(struct isert_conn *isert_conn) isert_dbg("conn %p\n", isert_conn); - if (device && device->use_fastreg) + BUG_ON(!device); + + if (device->use_fastreg) isert_conn_free_fastreg_pool(isert_conn); isert_free_rx_descriptors(isert_conn); @@ -814,10 +816,9 @@ isert_connect_release(struct isert_conn *isert_conn) if (isert_conn->login_buf) isert_free_login_buf(isert_conn); - kfree(isert_conn); + isert_device_put(device); - if (device) - isert_device_put(device); + kfree(isert_conn); } static void -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
