diff options
| author | Ishan Mittal <imittal@nvidia.com> | 2014-06-05 13:31:21 +0530 |
|---|---|---|
| committer | Ishan Mittal <imittal@nvidia.com> | 2014-06-05 13:37:37 +0530 |
| commit | dce68ca8e1015cf5bcd33284c0c1c9191e79885d (patch) | |
| tree | 7fed5c66956b9ffeadac67750aa042fc9b70f1a1 /net/rds/iw.c | |
| parent | 60ca8709496cbcfe7dc931a2ec8786f82b2761eb (diff) | |
| parent | be67db109090b17b56eb8eb2190cd70700f107aa (diff) | |
Merge branch 'linux-3.10.40' into rel-21
Bug 200004122
Conflicts:
drivers/cpufreq/cpufreq.c
drivers/regulator/core.c
sound/soc/codecs/max98090.c
Change-Id: I9418a05ad5c56b2e902249218bac2fa594d99f56
Signed-off-by: Ishan Mittal <imittal@nvidia.com>
Diffstat (limited to 'net/rds/iw.c')
| -rw-r--r-- | net/rds/iw.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/rds/iw.c b/net/rds/iw.c index 7826d46baa70..589935661d66 100644 --- a/net/rds/iw.c +++ b/net/rds/iw.c @@ -239,7 +239,8 @@ static int rds_iw_laddr_check(__be32 addr) ret = rdma_bind_addr(cm_id, (struct sockaddr *)&sin); /* due to this, we will claim to support IB devices unless we check node_type. */ - if (ret || cm_id->device->node_type != RDMA_NODE_RNIC) + if (ret || !cm_id->device || + cm_id->device->node_type != RDMA_NODE_RNIC) ret = -EADDRNOTAVAIL; rdsdebug("addr %pI4 ret %d node type %d\n", |