Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two easy cases of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -304,7 +304,8 @@ nomem:
|
||||
ret = -ENOMEM;
|
||||
sock_error:
|
||||
mutex_unlock(&rxnet->local_mutex);
|
||||
kfree(local);
|
||||
if (local)
|
||||
call_rcu(&local->rcu, rxrpc_local_rcu);
|
||||
_leave(" = %d", ret);
|
||||
return ERR_PTR(ret);
|
||||
|
||||
|
Reference in New Issue
Block a user