diff options
| author | Jakub Kicinski <jakub.kicinski@intel.com> | 2013-04-03 16:50:54 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-05 00:49:13 -0400 |
| commit | f01fc1a82c2ee68726b400fadb156bd623b5f2f1 (patch) | |
| tree | a8a38e688acb792ea5b88114f9092de6d28ff7de /drivers/net | |
| parent | 0e82e7f6dfeec1013339612f74abc2cdd29d43d2 (diff) | |
| download | linux-stable-f01fc1a82c2ee68726b400fadb156bd623b5f2f1.tar.gz linux-stable-f01fc1a82c2ee68726b400fadb156bd623b5f2f1.tar.bz2 linux-stable-f01fc1a82c2ee68726b400fadb156bd623b5f2f1.zip | |
ixgbe: fix registration order of driver and DCA nofitication
ixgbe_notify_dca cannot be called before driver registration
because it expects driver's klist_devices to be allocated and
initialized. While on it make sure debugfs files are removed
when registration fails.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Jakub Kicinski <jakub.kicinski@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index db5611ae407e..79f4a26ea6cc 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -7922,12 +7922,19 @@ static int __init ixgbe_init_module(void) ixgbe_dbg_init(); #endif /* CONFIG_DEBUG_FS */ + ret = pci_register_driver(&ixgbe_driver); + if (ret) { +#ifdef CONFIG_DEBUG_FS + ixgbe_dbg_exit(); +#endif /* CONFIG_DEBUG_FS */ + return ret; + } + #ifdef CONFIG_IXGBE_DCA dca_register_notify(&dca_notifier); #endif - ret = pci_register_driver(&ixgbe_driver); - return ret; + return 0; } module_init(ixgbe_init_module); |