From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Arthur Kiyanovski <akiyano@amazon.com>,
"David S . Miller" <davem@davemloft.net>,
Sasha Levin <sashal@kernel.org>
Subject: [PATCH AUTOSEL 4.14 11/15] net: ena: fix warning in rmmod caused by double iounmap
Date: Mon, 22 Oct 2018 06:20:22 -0400 [thread overview]
Message-ID: <20181022102026.40869-11-sashal@kernel.org> (raw)
In-Reply-To: <20181022102026.40869-1-sashal@kernel.org>
From: Arthur Kiyanovski <akiyano@amazon.com>
[ Upstream commit d79c3888bde6581da7ff9f9d6f581900ecb5e632 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/net/ethernet/amazon/ena/ena_netdev.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c
index 60b3ee29d82c..08c9c99a8331 100644
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
@@ -3059,15 +3059,8 @@ static int ena_rss_init_default(struct ena_adapter *adapter)
static void ena_release_bars(struct ena_com_dev *ena_dev, struct pci_dev *pdev)
{
- int release_bars;
+ int release_bars = pci_select_bars(pdev, IORESOURCE_MEM) & ENA_BAR_MASK;
- if (ena_dev->mem_bar)
- devm_iounmap(&pdev->dev, ena_dev->mem_bar);
-
- if (ena_dev->reg_bar)
- devm_iounmap(&pdev->dev, ena_dev->reg_bar);
-
- release_bars = pci_select_bars(pdev, IORESOURCE_MEM) & ENA_BAR_MASK;
pci_release_selected_regions(pdev, release_bars);
}
--
2.17.1
next prev parent reply other threads:[~2018-10-22 10:21 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-22 10:20 [PATCH AUTOSEL 4.14 01/15] ARM: dts: imx53-qsb: disable 1.2GHz OPP Sasha Levin
2018-10-22 10:20 ` [PATCH AUTOSEL 4.14 02/15] s390/hibernate: fix error handling when suspend cpu != resume cpu Sasha Levin
2018-10-26 9:05 ` Pavel Machek
2018-10-26 9:22 ` Greg KH
2018-10-26 10:15 ` Pavel Machek
2018-10-26 11:09 ` Sasha Levin
2018-10-26 12:18 ` Gerald Schaefer
2018-10-22 10:20 ` [PATCH AUTOSEL 4.14 03/15] Input: i8042 - enable keyboard wakeups by default when s2idle is used Sasha Levin
2018-10-26 9:04 ` Pavel Machek
2018-10-26 10:56 ` Sasha Levin
2018-10-22 10:20 ` [PATCH AUTOSEL 4.14 04/15] Input: mousedev - add a schedule point in mousedev_write() Sasha Levin
2018-10-22 10:20 ` [PATCH AUTOSEL 4.14 05/15] perf python: Use -Wno-redundant-decls to build with PYTHON=python3 Sasha Levin
2018-10-22 10:20 ` [PATCH AUTOSEL 4.14 06/15] Input: evdev - add a schedule point in evdev_write() Sasha Levin
2018-10-22 10:20 ` [PATCH AUTOSEL 4.14 07/15] Input: uinput - add a schedule point in uinput_inject_events() Sasha Levin
2018-10-22 10:20 ` [PATCH AUTOSEL 4.14 08/15] rxrpc: Don't check RXRPC_CALL_TX_LAST after calling rxrpc_rotate_tx_window() Sasha Levin
2018-10-22 10:20 ` [PATCH AUTOSEL 4.14 09/15] rxrpc: Only take the rwind and mtu values from latest ACK Sasha Levin
2018-10-22 10:20 ` [PATCH AUTOSEL 4.14 10/15] rxrpc: Fix connection-level abort handling Sasha Levin
2018-10-22 10:20 ` Sasha Levin [this message]
2018-10-22 10:20 ` [PATCH AUTOSEL 4.14 12/15] net: ena: fix NULL dereference due to untimely napi initialization Sasha Levin
2018-10-22 10:20 ` [PATCH AUTOSEL 4.14 13/15] libertas: call into generic suspend code before turning off power Sasha Levin
2018-10-22 10:20 ` [PATCH AUTOSEL 4.14 14/15] selftests: rtnetlink.sh explicitly requires bash Sasha Levin
2018-10-22 10:20 ` [PATCH AUTOSEL 4.14 15/15] fs/fat/fatent.c: add cond_resched() to fat_count_free_clusters() Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181022102026.40869-11-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=akiyano@amazon.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.