From patchwork Tue Nov 19 15:40:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirsher, Jeffrey T" X-Patchwork-Id: 292482 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A4B992C00BD for ; Wed, 20 Nov 2013 02:41:28 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753104Ab3KSPlA (ORCPT ); Tue, 19 Nov 2013 10:41:00 -0500 Received: from mga02.intel.com ([134.134.136.20]:11437 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753089Ab3KSPk7 (ORCPT ); Tue, 19 Nov 2013 10:40:59 -0500 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP; 19 Nov 2013 07:40:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.93,729,1378882800"; d="scan'208";a="430299064" Received: from unknown (HELO jtkirshe-mobl.amr.corp.intel.com) ([10.255.15.59]) by fmsmga001.fm.intel.com with ESMTP; 19 Nov 2013 07:40:58 -0800 From: Jeff Kirsher To: davem@davemloft.net Cc: Carolyn Wyborny , netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com, Jeff Kirsher Subject: [net 3/3] igb: Update queue reinit function to call dev_close when init of queues fails Date: Tue, 19 Nov 2013 07:40:54 -0800 Message-Id: <1384875654-7795-4-git-send-email-jeffrey.t.kirsher@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1384875654-7795-1-git-send-email-jeffrey.t.kirsher@intel.com> References: <1384875654-7795-1-git-send-email-jeffrey.t.kirsher@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Carolyn Wyborny This patch adds a call to dev_close if the queue reinit fails in order to make clearer to the user that the device is down. Signed-off-by: Carolyn Wyborny Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher --- drivers/net/ethernet/intel/igb/igb_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index ebe6370..40320bd 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -7847,6 +7847,7 @@ int igb_reinit_queues(struct igb_adapter *adapter) if (igb_init_interrupt_scheme(adapter, true)) { dev_err(&pdev->dev, "Unable to allocate memory for queues\n"); + dev_close(netdev); return -ENOMEM; }