iwlagn: clean up error path in iwl_pci_probe
authorHelmut Schaa <helmut.schaa@googlemail.com>
Thu, 12 Feb 2009 17:51:03 +0000 (18:51 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 27 Feb 2009 19:51:46 +0000 (14:51 -0500)
commit795cc0ad54128ada6f54d8b1eb051a907df6387e
tree8af6c23cec22ad8dc37b051981b216ac2fde833f
parent8bd1d07f9345750bd4d767e6c1600919672f98ba
iwlagn: clean up error path in iwl_pci_probe

This avoids triggering a BUG_ON in pci_disable_msi in the error path.
Furthermore remove the first call to pci_disable_device as it is already
called at out_pci_disable_device.

Both issues were introduced in the patch "iwlagn: fix hw-rfkill while
the interface is down".

Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Acked-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-agn.c