[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1339528412-4163-1-git-send-email-levinsasha928@gmail.com>
Date: Tue, 12 Jun 2012 21:13:32 +0200
From: Sasha Levin <levinsasha928@...il.com>
To: johannes.berg@...el.com, wey-yi.w.guy@...el.com,
linville@...driver.com
Cc: ilw@...ux.intel.com, linux-wireless@...r.kernel.org,
netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
Sasha Levin <levinsasha928@...il.com>
Subject: [PATCH] iwlwifi: re-order module_init order to prevent NULL ptr deref
We need to make sure iwl_drv_init is called before iwl_init, since otherwise
iwl_init will NULL ptr deref when trying to add a new mode.
Signed-off-by: Sasha Levin <levinsasha928@...il.com>
---
drivers/net/wireless/iwlwifi/Makefile | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile
index 98c8f64..16e39a4 100644
--- a/drivers/net/wireless/iwlwifi/Makefile
+++ b/drivers/net/wireless/iwlwifi/Makefile
@@ -1,5 +1,3 @@
-obj-$(CONFIG_IWLDVM) += dvm/
-
CFLAGS_iwl-devtrace.o := -I$(src)
# common
@@ -14,4 +12,6 @@ iwlwifi-objs += pcie/1000.o pcie/2000.o pcie/5000.o pcie/6000.o
iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o
+obj-$(CONFIG_IWLDVM) += dvm/
+
ccflags-y += -D__CHECK_ENDIAN__ -I$(src)
--
1.7.8.6
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists