diff --git a/[refs] b/[refs] index e47fbe547515..101d57dea69f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aabc5649078310094cbffb430fcbf9c25b6268f9 +refs/heads/master: f49a4589e9e25ef525da449b1ce5597cb659bbb5 diff --git a/trunk/drivers/net/sfc/efx.c b/trunk/drivers/net/sfc/efx.c index 6486657c47b8..649a264d6a81 100644 --- a/trunk/drivers/net/sfc/efx.c +++ b/trunk/drivers/net/sfc/efx.c @@ -1861,6 +1861,7 @@ int efx_reset(struct efx_nic *efx, enum reset_type method) } if (disabled) { + dev_close(efx->net_dev); EFX_ERR(efx, "has been disabled\n"); efx->state = STATE_DISABLED; } else { @@ -1884,8 +1885,7 @@ static void efx_reset_work(struct work_struct *data) } rtnl_lock(); - if (efx_reset(efx, efx->reset_pending)) - dev_close(efx->net_dev); + (void)efx_reset(efx, efx->reset_pending); rtnl_unlock(); }