diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-10-14 10:11:45 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-10-14 10:11:45 +0200 |
commit | 6edcf57233108df2e50ab5d3fa695ea958b4c779 (patch) | |
tree | 7f233132de3cf1d438ac5ca51cfa6e9c48f8b86f /net/smc/smc_pnet.c | |
parent | x86/unwinder: Make CONFIG_UNWINDER_ORC=y the default in the 64-bit defconfig (diff) | |
parent | objtool: Upgrade libelf-devel warning to error for CONFIG_ORC_UNWINDER (diff) | |
download | linux-6edcf57233108df2e50ab5d3fa695ea958b4c779.tar.xz linux-6edcf57233108df2e50ab5d3fa695ea958b4c779.zip |
Merge branch 'core/urgent' into x86/asm, to pick up dependency
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/smc/smc_pnet.c')
-rw-r--r-- | net/smc/smc_pnet.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/smc/smc_pnet.c b/net/smc/smc_pnet.c index 78f7af28ae4f..31f8453c25c5 100644 --- a/net/smc/smc_pnet.c +++ b/net/smc/smc_pnet.c @@ -181,8 +181,10 @@ static int smc_pnet_enter(struct smc_pnetentry *new_pnetelem) sizeof(new_pnetelem->ndev->name)) || smc_pnet_same_ibname(pnetelem, new_pnetelem->smcibdev->ibdev->name, - new_pnetelem->ib_port)) + new_pnetelem->ib_port)) { + dev_put(pnetelem->ndev); goto found; + } } list_add_tail(&new_pnetelem->list, &smc_pnettable.pnetlist); rc = 0; |