Merge branches 'cxgb4', 'misc', 'mlx4', 'nes' and 'qib' into for-next

[net-next-2.6.git] / drivers / infiniband / hw / cxgb4 / provider.c

diff --git a/drivers/infiniband/hw/cxgb4/provider.c b/drivers/infiniband/hw/cxgb4/provider.c
index dfc49020bb9cecf37e81328431a4a46a0f171678..8f645c83a125c1c9a1e3ad3ff400c3d90a0fec3a 100644 (file)
--- a/drivers/infiniband/hw/cxgb4/provider.c
+++ b/drivers/infiniband/hw/cxgb4/provider.c
@@ -486,7 +486,7 @@ int c4iw_register_device(struct c4iw_dev *dev)
        dev->ibdev.iwcm->rem_ref = c4iw_qp_rem_ref;
        dev->ibdev.iwcm->get_qp = c4iw_get_qp;
 
-       ret = ib_register_device(&dev->ibdev);
+       ret = ib_register_device(&dev->ibdev, NULL);
        if (ret)
                goto bail1;
 
@@ -496,6 +496,7 @@ int c4iw_register_device(struct c4iw_dev *dev)
                if (ret)
                        goto bail2;
        }
+       dev->registered = 1;
        return 0;
 bail2:
        ib_unregister_device(&dev->ibdev);
@@ -514,5 +515,6 @@ void c4iw_unregister_device(struct c4iw_dev *dev)
                                   c4iw_class_attributes[i]);
        ib_unregister_device(&dev->ibdev);
        kfree(dev->ibdev.iwcm);
+       dev->registered = 0;
        return;
 }