diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2018-05-09 17:40:44 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2018-05-09 17:40:44 +0200 |
| commit | 4c0330208f6bfe5285bae239fdb2a7ec1ce1f78d (patch) | |
| tree | 257c871b0be4c7eafa0e6911ab596bfb0f51a104 /net/dccp/timer.c | |
| parent | 7781edaed63e9396fc913e0899cb197562e6f1a0 (diff) | |
| parent | 76aa3de7095f15af7300012cb29ea8ab93eec348 (diff) | |
Merge tag 'at24-4.17-rc5-fixes-for-wolfram' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-current
Single bug-fix for a regression introduced during the 4.17 merge window.
Diffstat (limited to 'net/dccp/timer.c')
| -rw-r--r-- | net/dccp/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/timer.c b/net/dccp/timer.c index b50a8732ff43..1501a20a94ca 100644 --- a/net/dccp/timer.c +++ b/net/dccp/timer.c @@ -232,6 +232,7 @@ static void dccp_write_xmitlet(unsigned long data) else dccp_write_xmit(sk); bh_unlock_sock(sk); + sock_put(sk); } static void dccp_write_xmit_timer(struct timer_list *t) @@ -240,7 +241,6 @@ static void dccp_write_xmit_timer(struct timer_list *t) struct sock *sk = &dp->dccps_inet_connection.icsk_inet.sk; dccp_write_xmitlet((unsigned long)sk); - sock_put(sk); } void dccp_init_xmit_timers(struct sock *sk) |