diff options
| author | Brian Norris <briannorris@chromium.org> | 2017-05-12 09:42:04 -0700 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2017-05-19 09:01:57 +0300 |
| commit | bc69ca391eff0de1fb57066a5407d59723ed2da5 (patch) | |
| tree | cf3bb07bd4de1ee7447da8564857768133d0cc6c | |
| parent | 6eb2d002d4ea3157c7dee90dcaf6ca13cd729169 (diff) | |
| download | linux-stable-bc69ca391eff0de1fb57066a5407d59723ed2da5.tar.gz linux-stable-bc69ca391eff0de1fb57066a5407d59723ed2da5.tar.bz2 linux-stable-bc69ca391eff0de1fb57066a5407d59723ed2da5.zip | |
mwifiex: remove useless 'mwifiex_lock'
If mwifiex_shutdown_drv() is racing with another mwifiex_shutdown_drv(),
we *really* have problems. Kill the lock.
Signed-off-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
| -rw-r--r-- | drivers/net/wireless/marvell/mwifiex/init.c | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/marvell/mwifiex/main.h | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/init.c b/drivers/net/wireless/marvell/mwifiex/init.c index 2ada202c72ec..2bff87bd76a6 100644 --- a/drivers/net/wireless/marvell/mwifiex/init.c +++ b/drivers/net/wireless/marvell/mwifiex/init.c @@ -439,7 +439,6 @@ int mwifiex_init_lock_list(struct mwifiex_adapter *adapter) struct mwifiex_private *priv; s32 i, j; - spin_lock_init(&adapter->mwifiex_lock); spin_lock_init(&adapter->int_lock); spin_lock_init(&adapter->main_proc_lock); spin_lock_init(&adapter->mwifiex_cmd_lock); @@ -693,11 +692,8 @@ mwifiex_shutdown_drv(struct mwifiex_adapter *adapter) spin_unlock_irqrestore(&adapter->rx_proc_lock, flags); - spin_lock(&adapter->mwifiex_lock); - mwifiex_adapter_cleanup(adapter); - spin_unlock(&adapter->mwifiex_lock); adapter->hw_status = MWIFIEX_HW_STATUS_NOT_READY; } diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h index 6e76b302739b..c1d96c64af74 100644 --- a/drivers/net/wireless/marvell/mwifiex/main.h +++ b/drivers/net/wireless/marvell/mwifiex/main.h @@ -870,8 +870,6 @@ struct mwifiex_adapter { bool rx_locked; bool main_locked; struct mwifiex_bss_prio_tbl bss_prio_tbl[MWIFIEX_MAX_BSS_NUM]; - /* spin lock for init/shutdown */ - spinlock_t mwifiex_lock; /* spin lock for main process */ spinlock_t main_proc_lock; u32 mwifiex_processing; |