'card->dev' is initialized once and is never cleared. Drop the
unnecessary "safety" check, as it simply obscures things, and we don't
do this check everywhere (and therefore it's not really "safe").

Signed-off-by: Brian Norris <[email protected]>
---
new in v2
---
 drivers/net/wireless/marvell/mwifiex/pcie.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c 
b/drivers/net/wireless/marvell/mwifiex/pcie.c
index a1907e8e620f..1993b9b339df 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -2958,15 +2958,12 @@ static void mwifiex_cleanup_pcie(struct mwifiex_adapter 
*adapter)
                                    "Failed to write driver not-ready 
signature\n");
        }
 
-       if (pdev) {
-               pci_disable_device(pdev);
+       pci_disable_device(pdev);
 
-               pci_iounmap(pdev, card->pci_mmap);
-               pci_iounmap(pdev, card->pci_mmap1);
-               pci_disable_device(pdev);
-               pci_release_region(pdev, 2);
-               pci_release_region(pdev, 0);
-       }
+       pci_iounmap(pdev, card->pci_mmap);
+       pci_iounmap(pdev, card->pci_mmap1);
+       pci_release_region(pdev, 2);
+       pci_release_region(pdev, 0);
 
        mwifiex_pcie_free_buffers(adapter);
 }
-- 
2.14.0.rc0.284.gd933b75aa4-goog

Reply via email to