diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/netconsole.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index dcb21347c670..adeee615dd19 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c | |||
| @@ -684,15 +684,12 @@ restart: | |||
| 684 | case NETDEV_RELEASE: | 684 | case NETDEV_RELEASE: |
| 685 | case NETDEV_JOIN: | 685 | case NETDEV_JOIN: |
| 686 | case NETDEV_UNREGISTER: | 686 | case NETDEV_UNREGISTER: |
| 687 | /* | 687 | /* rtnl_lock already held |
| 688 | * rtnl_lock already held | ||
| 689 | * we might sleep in __netpoll_cleanup() | 688 | * we might sleep in __netpoll_cleanup() |
| 690 | */ | 689 | */ |
| 691 | spin_unlock_irqrestore(&target_list_lock, flags); | 690 | spin_unlock_irqrestore(&target_list_lock, flags); |
| 692 | 691 | ||
| 693 | mutex_lock(&nt->mutex); | ||
| 694 | __netpoll_cleanup(&nt->np); | 692 | __netpoll_cleanup(&nt->np); |
| 695 | mutex_unlock(&nt->mutex); | ||
| 696 | 693 | ||
| 697 | spin_lock_irqsave(&target_list_lock, flags); | 694 | spin_lock_irqsave(&target_list_lock, flags); |
| 698 | dev_put(nt->np.dev); | 695 | dev_put(nt->np.dev); |
