diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-30 23:59:19 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-30 23:59:19 -0400 |
| commit | 8fa76f7e61ef4e5bc97207143ea4e198b22487bc (patch) | |
| tree | 266c42b6687e68e4febb72d8c031e5facd899a1c /drivers/infiniband/hw/mlx4/main.c | |
| parent | a41a7b91772da2c77ac0da74285fd8ebd86a85ba (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/infiniband/hw/mlx4/main.c')
| -rw-r--r-- | drivers/infiniband/hw/mlx4/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c index 39051417054c..4e94e360e43b 100644 --- a/drivers/infiniband/hw/mlx4/main.c +++ b/drivers/infiniband/hw/mlx4/main.c | |||
| @@ -662,7 +662,7 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) | |||
| 662 | spin_lock_init(&ibdev->sm_lock); | 662 | spin_lock_init(&ibdev->sm_lock); |
| 663 | mutex_init(&ibdev->cap_mask_mutex); | 663 | mutex_init(&ibdev->cap_mask_mutex); |
| 664 | 664 | ||
| 665 | if (ib_register_device(&ibdev->ib_dev)) | 665 | if (ib_register_device(&ibdev->ib_dev, NULL)) |
| 666 | goto err_map; | 666 | goto err_map; |
| 667 | 667 | ||
| 668 | if (mlx4_ib_mad_init(ibdev)) | 668 | if (mlx4_ib_mad_init(ibdev)) |