From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Wei Yongjun <yongjun_wei@trendmicro.com.cn>,
netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 02/11] igbvf: add missing iounmap() on error in igbvf_probe()
Date: Thu, 24 Oct 2013 08:27:29 -0700 [thread overview]
Message-ID: <1382628458-26601-3-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1382628458-26601-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Add the missing iounmap() before return from igbvf_probe()
in the error handling case.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Tested-by: Sibai Li <Sibai.li@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/igbvf/netdev.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index f48ae71..9fadbb2 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -2698,7 +2698,7 @@ static int igbvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (ei->get_variants) {
err = ei->get_variants(adapter);
if (err)
- goto err_ioremap;
+ goto err_get_variants;
}
/* setup adapter struct */
@@ -2795,6 +2795,7 @@ err_hw_init:
kfree(adapter->rx_ring);
err_sw_init:
igbvf_reset_interrupt_capability(adapter);
+err_get_variants:
iounmap(adapter->hw.hw_addr);
err_ioremap:
free_netdev(netdev);
--
1.8.3.1
next prev parent reply other threads:[~2013-10-24 15:27 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-24 15:27 [net-next 00/11][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2013-10-24 15:27 ` [net-next 01/11] igbvf: integer wrapping bug setting the mtu Jeff Kirsher
2013-10-24 15:27 ` Jeff Kirsher [this message]
2013-10-24 15:27 ` [net-next 03/11] i40e: remove unused including <linux/version.h> Jeff Kirsher
2013-10-24 15:27 ` [net-next 04/11] igb: Fix master/slave mode for all m88 i354 PHY's Jeff Kirsher
2013-10-24 15:27 ` [net-next 05/11] igb: fix driver reload with VF assigned to guest Jeff Kirsher
2013-10-24 15:27 ` [net-next 06/11] ixgbe: cleanup ixgbe_enumerate_functions Jeff Kirsher
2013-10-24 15:27 ` [net-next 07/11] ixgbe: use pcie_capability_read_word() to simplify code Jeff Kirsher
2013-10-24 15:27 ` [net-next 08/11] ixgbe: fix rx-usecs range checks for BQL Jeff Kirsher
2013-10-24 15:27 ` [net-next 09/11] ixgbevf: Adds function to set PSRTYPE register Jeff Kirsher
2013-10-24 15:27 ` [net-next 10/11] ixgbevf: implement ethtool get/set coalesce Jeff Kirsher
2013-10-24 15:27 ` [net-next 11/11] ixgbevf: bump driver version Jeff Kirsher
2013-10-26 4:30 ` [net-next 00/11][pull request] Intel Wired LAN Driver Updates David Miller
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=1382628458-26601-3-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=gospo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=sassmann@redhat.com \
--cc=yongjun_wei@trendmicro.com.cn \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).