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 11/11] i40e: fix error return code in i40e_probe()
Date: Tue, 29 Oct 2013 05:02:31 -0700 [thread overview]
Message-ID: <1383048151-15002-12-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1383048151-15002-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Fix to return -ENOMEM in the memory alloc error handling
case instead of 0, as done elsewhere in this function.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_main.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 41a79df..be15938 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -7204,8 +7204,10 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
*/
len = sizeof(struct i40e_vsi *) * pf->hw.func_caps.num_vsis;
pf->vsi = kzalloc(len, GFP_KERNEL);
- if (!pf->vsi)
+ if (!pf->vsi) {
+ err = -ENOMEM;
goto err_switch_setup;
+ }
err = i40e_setup_pf_switch(pf);
if (err) {
--
1.8.3.1
next prev parent reply other threads:[~2013-10-29 12:02 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-29 12:02 [net-next 00/11][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2013-10-29 12:02 ` [net-next 01/11] vxlan: Have the NIC drivers do less work for offloads Jeff Kirsher
2013-10-29 12:02 ` [net-next 02/11] net: add might_sleep() call to napi_disable Jeff Kirsher
2013-10-29 12:02 ` [net-next 03/11] ixgbe: fix qv_lock_napi call in ixgbe_napi_disable_all Jeff Kirsher
2013-10-29 12:02 ` [net-next 04/11] ixgbe: show <2% for encoding loss on PCIe Gen3 Jeff Kirsher
2013-10-29 12:02 ` [net-next 05/11] ixgbe: remove unnecessary duplication of PCIe bandwidth display Jeff Kirsher
2013-10-29 12:02 ` [net-next 06/11] ixgbevf: add ixgbevf_rx_skb Jeff Kirsher
2013-10-29 12:02 ` [net-next 07/11] ixgbevf: have clean_rx_irq return total_rx_packets cleaned Jeff Kirsher
2013-10-29 12:02 ` [net-next 08/11] ixgbevf: implement CONFIG_NET_RX_BUSY_POLL Jeff Kirsher
2013-10-29 12:02 ` [net-next 09/11] ixgbevf: add BP_EXTENDED_STATS for CONFIG_NET_RX_BUSY_POLL Jeff Kirsher
2013-10-29 12:02 ` [net-next 10/11] ixgbevf: Add zero_base handler to network statistics Jeff Kirsher
2013-10-29 12:02 ` Jeff Kirsher [this message]
2013-10-29 17:05 ` [net-next 11/11] i40e: fix error return code in i40e_probe() Joe Perches
2013-10-29 22:57 ` David Miller
2013-10-29 23:02 ` Joe Perches
2013-10-29 22:58 ` [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=1383048151-15002-12-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).