2 files changed, 5 insertions, 0 deletions

diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index cf837831304b..f9751294ece7 100644
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -531,6 +531,7 @@ struct be_adapter {
 
         struct delayed_work be_err_detection_work;
         u8 err_flags;
+        bool pcicfg_mapped;     /* pcicfg obtained via pci_iomap() */
         u32 flags;
         u32 cmd_privileges;
         /* Ethtool knobs and info */
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index db81e3d9623f..d1cf1274fc2f 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -4970,6 +4970,8 @@ static void be_unmap_pci_bars(struct be_adapter *adapter)
                 pci_iounmap(adapter->pdev, adapter->csr);
         if (adapter->db)
                 pci_iounmap(adapter->pdev, adapter->db);
+        if (adapter->pcicfg && adapter->pcicfg_mapped)
+                pci_iounmap(adapter->pdev, adapter->pcicfg);
 }
 
 static int db_bar(struct be_adapter *adapter)
@@ -5021,8 +5023,10 @@ static int be_map_pci_bars(struct be_adapter *adapter)
                         if (!addr)
                                 goto pci_map_err;
                         adapter->pcicfg = addr;
+                        adapter->pcicfg_mapped = true;
                 } else {
                         adapter->pcicfg = adapter->db + SRIOV_VF_PCICFG_OFFSET;
+                        adapter->pcicfg_mapped = false;
                 }
         }