diff options
| author | David S. Miller <davem@davemloft.net> | 2019-06-17 22:48:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-17 23:20:36 -0400 |
| commit | 13091aa30535b719e269f20a7bc34002bf5afae5 (patch) | |
| tree | bd17956c3ce606a119fadbd43bfa1c0c10006984 /net/lapb/lapb_iface.c | |
| parent | f97252a8c33f0e02f4ffbf61dc94cd38164007bc (diff) | |
| parent | 29f785ff76b65696800b75c3d8e0b58e603bb1d0 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Honestly all the conflicts were simple overlapping changes,
nothing really interesting to report.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/lapb/lapb_iface.c')
| -rw-r--r-- | net/lapb/lapb_iface.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/lapb/lapb_iface.c b/net/lapb/lapb_iface.c index 600d754a1700..3c03f6512c5f 100644 --- a/net/lapb/lapb_iface.c +++ b/net/lapb/lapb_iface.c | |||
| @@ -176,6 +176,7 @@ int lapb_unregister(struct net_device *dev) | |||
| 176 | lapb = __lapb_devtostruct(dev); | 176 | lapb = __lapb_devtostruct(dev); |
| 177 | if (!lapb) | 177 | if (!lapb) |
| 178 | goto out; | 178 | goto out; |
| 179 | lapb_put(lapb); | ||
| 179 | 180 | ||
| 180 | lapb_stop_t1timer(lapb); | 181 | lapb_stop_t1timer(lapb); |
| 181 | lapb_stop_t2timer(lapb); | 182 | lapb_stop_t2timer(lapb); |