aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorReinette Chatre <reinette.chatre@intel.com>2009-07-24 14:13:12 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-07-29 15:45:53 -0400
commitf7ea097d9b4e61a816c041c92548aad7c7ed7915 (patch)
tree281e453f3ac975c94204ef338473bbd8417cd252 /drivers/net
parent1da46bebb1bb01a77333e6509e74e12b85df5729 (diff)
iwlagn: fix null pointer access during ucode load on 1000
Commit "iwlwifi: Handle new firmware file with ucode build number in header" introduced new ucode header parsing routines, but neglected to initialize these routines for 1000. The system thus goes into infinite loop trying to load ucode, failing every time with a null pointer exception as it tries to parse the header. Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-1000.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
index 80a28184a373..5f7c52053c18 100644
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
@@ -124,6 +124,7 @@ static struct iwl_lib_ops iwl1000_lib = {
124}; 124};
125 125
126static struct iwl_ops iwl1000_ops = { 126static struct iwl_ops iwl1000_ops = {
127 .ucode = &iwl5000_ucode,
127 .lib = &iwl1000_lib, 128 .lib = &iwl1000_lib,
128 .hcmd = &iwl5000_hcmd, 129 .hcmd = &iwl5000_hcmd,
129 .utils = &iwl5000_hcmd_utils, 130 .utils = &iwl5000_hcmd_utils,