diff options
author | Takashi Iwai <tiwai@suse.de> | 2016-08-25 11:56:09 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2016-08-25 11:56:09 -0400 |
commit | a820cd3d25c2891028b5f296a8a871ce6dd92c0d (patch) | |
tree | 3e86aeb1b898e9ca0dd6754dc7e6ff68865ee175 /net/tipc/socket.c | |
parent | abaa2274811d607679e8687b4118c4922a3517ac (diff) | |
parent | cfb89f2e7505c6823020a18bbdc5410284305234 (diff) |
Merge tag 'asoc-fix-v4.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.8
A clutch of fixes for v4.8. These are mainly driver specific, the most
notable ones being those for OMAP which fix a series of issues that
broke boot on some platforms there when deferred probe kicked in.
There's also one core fix for an issue when unbinding a card which for
some reason had managed to not manifest until recently.
Diffstat (limited to 'net/tipc/socket.c')
-rw-r--r-- | net/tipc/socket.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index c49b8df438cb..f9f5f3c3dab5 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c | |||
@@ -2180,7 +2180,8 @@ restart: | |||
2180 | TIPC_CONN_MSG, SHORT_H_SIZE, | 2180 | TIPC_CONN_MSG, SHORT_H_SIZE, |
2181 | 0, dnode, onode, dport, oport, | 2181 | 0, dnode, onode, dport, oport, |
2182 | TIPC_CONN_SHUTDOWN); | 2182 | TIPC_CONN_SHUTDOWN); |
2183 | tipc_node_xmit_skb(net, skb, dnode, tsk->portid); | 2183 | if (skb) |
2184 | tipc_node_xmit_skb(net, skb, dnode, tsk->portid); | ||
2184 | } | 2185 | } |
2185 | tsk->connected = 0; | 2186 | tsk->connected = 0; |
2186 | sock->state = SS_DISCONNECTING; | 2187 | sock->state = SS_DISCONNECTING; |