From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Garzik Subject: Re: [PATCH] e1000: Fix msi enable leak on error, don't print error message, cleanup Date: Wed, 16 May 2007 11:32:54 -0400 Message-ID: <464B2426.9060502@garzik.org> References: <20070516083120.23311.3272.stgit@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, e1000-devel@lists.sourceforge.net, hpa@zytor.com To: Auke Kok Return-path: Received: from srv5.dvmed.net ([207.36.208.214]:57846 "EHLO mail.dvmed.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756482AbXEPPc6 (ORCPT ); Wed, 16 May 2007 11:32:58 -0400 In-Reply-To: <20070516083120.23311.3272.stgit@localhost.localdomain> Sender: netdev-owner@vger.kernel.org List-Id: netdev.vger.kernel.org Auke Kok wrote: > pci_enable_msi failure is a normal event so we should not print any error. > Going over the code I spotted a missing pci_disable_msi() leak when irq > allocation fails. The whole code also needed a cleanup, so I combined the > two different calls to pci_request_irq into a single call making this > look a lot better. > > Signed-off-by: Auke Kok > Cc: H. Peter Anvin Looks OK, but compounds (and highlights) another problem: you shouldn't be adding CONFIG_PCI_MSI ifdefs to the code. MSI support is properly set up in the headers to enable working code even if CONFIG_PCI_MSI is disabled. Revise your patch to remove CONFIG_PCI_MSI tests, and I'll include it straightaway. Jeff