diff options
| author | Ziyann <jaraidaniel@gmail.com> | 2014-11-26 11:37:03 +0100 |
|---|---|---|
| committer | Ziyann <jaraidaniel@gmail.com> | 2014-11-26 11:37:03 +0100 |
| commit | e90611725bc4dcc8946e74c38bb2c58fdf6bf98f (patch) | |
| tree | a6a2441a53406a47f3a4b4a5103c0a067aaab445 /net/core/netpoll.c | |
| parent | da82942bbd6a40cf7ddd3edc52352610905137ce (diff) | |
| parent | 5dba9ddd98cbc7ad319d687887981a0ea0062c75 (diff) | |
| download | kernel_samsung_tuna-e90611725bc4dcc8946e74c38bb2c58fdf6bf98f.zip kernel_samsung_tuna-e90611725bc4dcc8946e74c38bb2c58fdf6bf98f.tar.gz kernel_samsung_tuna-e90611725bc4dcc8946e74c38bb2c58fdf6bf98f.tar.bz2 | |
Merge remote-tracking branch 'linux/linux-3.0.y' into stable-newpvr
Conflicts:
arch/arm/include/asm/hardware/cache-l2x0.h
Diffstat (limited to 'net/core/netpoll.c')
| -rw-r--r-- | net/core/netpoll.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 207a178..c497137 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -927,15 +927,14 @@ EXPORT_SYMBOL_GPL(__netpoll_cleanup); void netpoll_cleanup(struct netpoll *np) { - if (!np->dev) - return; - rtnl_lock(); + if (!np->dev) + goto out; __netpoll_cleanup(np); - rtnl_unlock(); - dev_put(np->dev); np->dev = NULL; +out: + rtnl_unlock(); } EXPORT_SYMBOL(netpoll_cleanup); |