Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f49a4589e9e25ef525da449b1ce5597cb659bbb5

Authored by Ben Hutchings
Committed by David S. Miller
1 parent aabc564907
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

sfc: Always close net device at the end of a disabling reset 

This fixes a regression introduced by commit
eb9f6744cbfa97674c13263802259b5aa0034594 "sfc: Implement ethtool
reset operation".

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Cc: stable@kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

drivers/net/sfc/efx.c
Diff comments   View file @ f49a458
... ... @@ -1861,6 +1861,7 @@
1861 1861 }
1862 1862  
1863 1863 if (disabled) {
  1864 + dev_close(efx->net_dev);
1864 1865 EFX_ERR(efx, "has been disabled\n");
1865 1866 efx->state = STATE_DISABLED;
1866 1867 } else {
... ... @@ -1884,8 +1885,7 @@
1884 1885 }
1885 1886  
1886 1887 rtnl_lock();
1887   - if (efx_reset(efx, efx->reset_pending))
1888   - dev_close(efx->net_dev);
  1888 + (void)efx_reset(efx, efx->reset_pending);
1889 1889 rtnl_unlock();
1890 1890 }
1891 1891