]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
r8152: fix lockup when runtime PM is enabled
authorPeter Wu <peter@lekensteyn.nl>
Tue, 8 Dec 2015 11:17:42 +0000 (12:17 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 9 Dec 2015 03:48:01 +0000 (22:48 -0500)
commit90186af404ada5a47b875bf3c16d0b02bb023ea0
tree0f08ac63447211f81449237e0b9ffe78996045a8
parentf406ce4234149c302a7acb0be01c08de7b40bdb5
r8152: fix lockup when runtime PM is enabled

When an interface is brought up which was previously suspended (via
runtime PM), it would hang. This happens because napi_disable is called
before napi_enable.

Solve this by avoiding napi_enable in the resume during open function
(netif_running is true when open is called, IFF_UP is set after a
successful open; netif_running is false when close is called, but IFF_UP
is then still set).

While at it, remove WORK_ENABLE check from rtl8152_open (introduced with
the original change) because it cannot happen:

 - After this patch, runtime resume will not set it during rtl8152_open.
 - When link is up, rtl8152_open is not called.
 - When link is down during system/auto suspend/resume, it is not set.

Fixes: 41cec84cf285 ("r8152: don't enable napi before rx ready")
Link: https://lkml.kernel.org/r/20151205105912.GA1766@al
Signed-off-by: Peter Wu <peter@lekensteyn.nl>
Acked-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/r8152.c