e1000: Fix msi enable leak on error, don't print error message, cleanup
authorAuke Kok <auke-jan.h.kok@intel.com>
Wed, 16 May 2007 08:49:46 +0000 (01:49 -0700)
committerJeff Garzik <jeff@garzik.org>
Fri, 18 May 2007 00:43:15 +0000 (20:43 -0400)
commite94bd23f67c87011f012f26ca0af3fcf6878eeac
tree59bd2c79007363beee0c50084e63f7840999bdfa
parentfb136c070bfdde11dc79758674f54fb26bba1a2f
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>
drivers/net/e1000/e1000.h
drivers/net/e1000/e1000_main.c