From ecdab60bea93fb92e1ba6b5846fc65dfdc5d1fb8 Mon Sep 17 00:00:00 2001 From: Amit Kumar Salecha Date: Tue, 13 Jul 2010 20:33:33 +0000 Subject: [PATCH] --- yaml --- r: 203574 b: refs/heads/master c: 0cf3a14cb2b888a7efa055ff7354e97c59fd48fa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/qlcnic/qlcnic_main.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cb95118ee085..9b68bcaecbd2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0df170b6078c58d1d2118a5f657fe366ecdc1262 +refs/heads/master: 0cf3a14cb2b888a7efa055ff7354e97c59fd48fa diff --git a/trunk/drivers/net/qlcnic/qlcnic_main.c b/trunk/drivers/net/qlcnic/qlcnic_main.c index 0fef8c3c553f..0995f90b0bac 100644 --- a/trunk/drivers/net/qlcnic/qlcnic_main.c +++ b/trunk/drivers/net/qlcnic/qlcnic_main.c @@ -3451,6 +3451,7 @@ static struct pci_driver qlcnic_driver = { static int __init qlcnic_init_module(void) { + int ret; printk(KERN_INFO "%s\n", qlcnic_driver_string); @@ -3459,8 +3460,15 @@ static int __init qlcnic_init_module(void) register_inetaddr_notifier(&qlcnic_inetaddr_cb); #endif + ret = pci_register_driver(&qlcnic_driver); + if (ret) { +#ifdef CONFIG_INET + unregister_inetaddr_notifier(&qlcnic_inetaddr_cb); + unregister_netdevice_notifier(&qlcnic_netdev_cb); +#endif + } - return pci_register_driver(&qlcnic_driver); + return ret; } module_init(qlcnic_init_module);