diff options
author | Arthur Kiyanovski <akiyano@amazon.com> | 2018-10-09 04:21:27 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-10-09 13:49:49 -0400 |
commit | d79c3888bde6581da7ff9f9d6f581900ecb5e632 (patch) | |
tree | a3a93a98d12134f6e5e2346e112de757d54e97bd | |
parent | e2a322a0c8ce3d825e8a56c063ce3f81b719083c (diff) |
net: ena: fix warning in rmmod caused by double iounmap
Memory mapped with devm_ioremap is automatically freed when the driver
is disconnected from the device. Therefore there is no need to
explicitly call devm_iounmap.
Fixes: 0857d92f71b6 ("net: ena: add missing unmap bars on device removal")
Fixes: 411838e7b41c ("net: ena: fix rare kernel crash when bar memory remap fails")
Signed-off-by: Arthur Kiyanovski <akiyano@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/amazon/ena/ena_netdev.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c index 25621a218f20..78d84ca0a378 100644 --- a/drivers/net/ethernet/amazon/ena/ena_netdev.c +++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c | |||
@@ -3099,15 +3099,8 @@ err_rss_init: | |||
3099 | 3099 | ||
3100 | static void ena_release_bars(struct ena_com_dev *ena_dev, struct pci_dev *pdev) | 3100 | static void ena_release_bars(struct ena_com_dev *ena_dev, struct pci_dev *pdev) |
3101 | { | 3101 | { |
3102 | int release_bars; | 3102 | int release_bars = pci_select_bars(pdev, IORESOURCE_MEM) & ENA_BAR_MASK; |
3103 | 3103 | ||
3104 | if (ena_dev->mem_bar) | ||
3105 | devm_iounmap(&pdev->dev, ena_dev->mem_bar); | ||
3106 | |||
3107 | if (ena_dev->reg_bar) | ||
3108 | devm_iounmap(&pdev->dev, ena_dev->reg_bar); | ||
3109 | |||
3110 | release_bars = pci_select_bars(pdev, IORESOURCE_MEM) & ENA_BAR_MASK; | ||
3111 | pci_release_selected_regions(pdev, release_bars); | 3104 | pci_release_selected_regions(pdev, release_bars); |
3112 | } | 3105 | } |
3113 | 3106 | ||