diff options
| author |   Adham Abozaeid <adham.abozaeid@microchip.com> | 2019-08-09 18:25:18 +0000 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-12 16:35:39 +0200 |
| commit | 0d1b57c1f04cad448eec54dc8de6da3777d3a28d (patch) | |
| tree | 2830729b8841d818d31f6d3207df66a9272c058e /drivers/staging/wilc1000/wilc_netdev.c | |
| parent | Merge 5.3-rc4 into staging-next (diff) | |
| download | linux-dev-0d1b57c1f04cad448eec54dc8de6da3777d3a28d.tar.xz linux-dev-0d1b57c1f04cad448eec54dc8de6da3777d3a28d.zip | |
staging: wilc1000: Don't reset WILC CPU disgracefully
Send abort request to WILC from wilc_wlan_stop instead of resetting the
CPU.
The abort request was being sent from wilc_wlan_cleanup after the CPU
was reset which wasn't the correct order. The abort request handler
in the chip will take care of resetting the CPU.
Signed-off-by: Adham Abozaeid <adham.abozaeid@microchip.com>
Link: https://lore.kernel.org/r/20190809182510.22443-2-adham.abozaeid@microchip.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000/wilc_netdev.c')
| -rw-r--r-- | drivers/staging/wilc1000/wilc_netdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/wilc1000/wilc_netdev.c b/drivers/staging/wilc1000/wilc_netdev.c index 57510400f243..cd11c35adcfe 100644 --- a/drivers/staging/wilc1000/wilc_netdev.c +++ b/drivers/staging/wilc1000/wilc_netdev.c @@ -475,7 +475,7 @@ static void wilc_wlan_deinitialize(struct net_device *dev) wlan_deinitialize_threads(dev); deinit_irq(dev); - wilc_wlan_stop(wl); + wilc_wlan_stop(wl, vif); wilc_wlan_cleanup(dev); wlan_deinit_locks(dev); @@ -573,7 +573,7 @@ static int wilc_wlan_initialize(struct net_device *dev, struct wilc_vif *vif) return 0; fail_fw_start: - wilc_wlan_stop(wl); + wilc_wlan_stop(wl, vif); fail_irq_enable: if (!wl->dev_irq_num && |