From: Brian Norris Date: Tue, 25 Jul 2017 01:13:32 +0000 (-0700) Subject: mwifiex: debugfs: allow card_reset() to cancel things X-Git-Tag: v4.14-rc1~130^2~356^2~55 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=37680819c6e1f5f22c171cd76d1ac093528fae56;p=platform%2Fkernel%2Flinux-rpi.git mwifiex: debugfs: allow card_reset() to cancel things The card_reset() implementation should be setting our state flags and cancelling commands for us (i.e., in mwifiex_shutdown_drv()), so let's not do it here. Also, this debugfs file is useful for testing and debugging the reset feature, so we shouldn't do extra preparatory steps here, as that might cause different reset behavior, which could either cause new bugs or paper over existing ones that this debug feature should otherwise help us catch. Signed-off-by: Brian Norris Signed-off-by: Kalle Valo --- diff --git a/drivers/net/wireless/marvell/mwifiex/debugfs.c b/drivers/net/wireless/marvell/mwifiex/debugfs.c index f6f105a..6f4239b 100644 --- a/drivers/net/wireless/marvell/mwifiex/debugfs.c +++ b/drivers/net/wireless/marvell/mwifiex/debugfs.c @@ -940,8 +940,6 @@ mwifiex_reset_write(struct file *file, if (adapter->if_ops.card_reset) { dev_info(adapter->dev, "Resetting per request\n"); - adapter->hw_status = MWIFIEX_HW_STATUS_RESET; - mwifiex_cancel_all_pending_cmd(adapter); adapter->if_ops.card_reset(adapter); }