Commit 1c2977c0 authored by Juliet Kim's avatar Juliet Kim Committed by David S. Miller
Browse files

net/ibmvnic: free reset work of removed device from queue

Commit 36f1031c ("ibmvnic: Do not process reset during or after
 device removal") made the change to exit reset if the driver has been
removed, but does not free reset work items of the adapter from queue.

Ensure all reset work items are freed when breaking out of the loop early.

Fixes: 36f1031c

 ("ibmnvic: Do not process reset during or after device removal”)
Signed-off-by: default avatarJuliet Kim <>
Signed-off-by: default avatarDavid S. Miller <>
parent 63b2ed4e
......@@ -1985,7 +1985,10 @@ static void __ibmvnic_reset(struct work_struct *work)
while (rwi) {
if (adapter->state == VNIC_REMOVING ||
adapter->state == VNIC_REMOVED)
goto out;
rc = EBUSY;
if (adapter->force_reset_recovery) {
adapter->force_reset_recovery = false;
......@@ -2011,7 +2014,7 @@ static void __ibmvnic_reset(struct work_struct *work)
netdev_dbg(adapter->netdev, "Reset failed\n");
adapter->resetting = false;
if (we_lock_rtnl)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment