diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-09 14:53:06 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-09 14:53:06 -0400 |
commit | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (patch) | |
tree | 83855363f7be25305477dca09a91166deb376354 /drivers/infiniband/core/cm.c | |
parent | f16393776fc133d95fe3b3ba7118df579ed90af5 (diff) | |
parent | 5091b353883ba3358998797efb284f82344531f3 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/mlx4: Check correct variable for allocation failure
RDMA/nes: Correct cap.max_inline_data assignment in nes_query_qp()
RDMA/cm: Set num_paths when manually assigning path records
IB/cm: Fix device_create() return value check
Diffstat (limited to 'drivers/infiniband/core/cm.c')
-rw-r--r-- | drivers/infiniband/core/cm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c index fc73d6ac11b..ad63b79afac 100644 --- a/drivers/infiniband/core/cm.c +++ b/drivers/infiniband/core/cm.c | |||
@@ -3694,7 +3694,7 @@ static void cm_add_one(struct ib_device *ib_device) | |||
3694 | cm_dev->device = device_create(&cm_class, &ib_device->dev, | 3694 | cm_dev->device = device_create(&cm_class, &ib_device->dev, |
3695 | MKDEV(0, 0), NULL, | 3695 | MKDEV(0, 0), NULL, |
3696 | "%s", ib_device->name); | 3696 | "%s", ib_device->name); |
3697 | if (!cm_dev->device) { | 3697 | if (IS_ERR(cm_dev->device)) { |
3698 | kfree(cm_dev); | 3698 | kfree(cm_dev); |
3699 | return; | 3699 | return; |
3700 | } | 3700 | } |