Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755705AbYAACNe (ORCPT ); Mon, 31 Dec 2007 21:13:34 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754561AbYAACIT (ORCPT ); Mon, 31 Dec 2007 21:08:19 -0500 Received: from fmailhost05.isp.att.net ([207.115.11.55]:56544 "EHLO fmailhost05.isp.att.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754235AbYAACIQ (ORCPT ); Mon, 31 Dec 2007 21:08:16 -0500 X-Originating-IP: [68.222.90.230] From: jacliburn@bellsouth.net To: jeff@garzik.org Cc: csnook@redhat.com, linux-kernel@vger.kernel.org, atl1-devel@lists.sourceforge.net, Jay Cliburn Subject: [PATCH 21/26] atl1: update atl1_close Date: Mon, 31 Dec 2007 19:59:59 -0600 Message-Id: <1199152804-3889-22-git-send-email-jacliburn@bellsouth.net> X-Mailer: git-send-email 1.5.3.3 In-Reply-To: <1199152804-3889-1-git-send-email-jacliburn@bellsouth.net> References: <1199152804-3889-1-git-send-email-jacliburn@bellsouth.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1327 Lines: 50 From: Jay Cliburn Update atl1_close() to conform with current vendor driver version 1.2.40.2. Signed-off-by: Jay Cliburn --- drivers/net/atlx/atl1.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c index 7d84a51..997c83c 100644 --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/atlx/atl1.c @@ -2558,6 +2558,18 @@ err_open: return err; } +static void atl1_free_irq(struct atl1_adapter *adapter) +{ + struct net_device *netdev = adapter->netdev; + + free_irq(adapter->pdev->irq, netdev); + +#ifdef CONFIG_PCI_MSI + if (adapter->have_msi) + pci_disable_msi(adapter->pdev); +#endif +} + /* * atl1_close - Disables a network interface * @netdev: network interface device structure @@ -2572,7 +2584,9 @@ err_open: static int atl1_close(struct net_device *netdev) { struct atl1_adapter *adapter = netdev_priv(netdev); + atl1_down(adapter); + atl1_free_irq(adapter); atl1_free_ring_resources(adapter); return 0; } -- 1.5.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/