From: Auke Kok <auke-jan.h.kok@intel.com>
Date: Wed, 16 May 2007 08:49:46 +0000 (-0700)
Subject: e1000: Fix msi enable leak on error, don't print error message, cleanup
X-Git-Tag: v2.6.22-rc2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e94bd23f67c87011f012f26ca0af3fcf6878eeac;p=pandora-kernel.git

e1000: Fix msi enable leak on error, don't print error message, cleanup

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. All #ifdef CONFIG_PCI_MSI's have been removed.

Compile tested with both CONFIG_PCI_MSI enabled and disabled.

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

Reading git-diff-tree failed