Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Minor overlapping changes in the btusb and ixgbe drivers.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 4f83f97ffe8b..2e5172f61564 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1984,8 +1984,11 @@ static void __ibmvnic_reset(struct work_struct *work)
         rwi = get_next_rwi(adapter);
         while (rwi) {
                 if (adapter->state == VNIC_REMOVING ||
-                    adapter->state == VNIC_REMOVED)
-                        goto out;
+                    adapter->state == VNIC_REMOVED) {
+                        kfree(rwi);
+                        rc = EBUSY;
+                        break;
+                }
 
                 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");
                 free_all_rwi(adapter);
         }
-out:
+
         adapter->resetting = false;
         if (we_lock_rtnl)
                 rtnl_unlock();