iwlagn: fix null pointer access during ucode load on 1000
authorReinette Chatre <reinette.chatre@intel.com>
Fri, 24 Jul 2009 18:13:12 +0000 (11:13 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 29 Jul 2009 19:45:53 +0000 (15:45 -0400)
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>
drivers/net/wireless/iwlwifi/iwl-1000.c

index 80a28184a373bbd28bd40879d4cdb1c4fd3bdb1f..5f7c52053c185ae9258894f49cccdd94f2c74e45 100644 (file)
@@ -124,6 +124,7 @@ static struct iwl_lib_ops iwl1000_lib = {
 };
 
 static struct iwl_ops iwl1000_ops = {
+       .ucode = &iwl5000_ucode,
        .lib = &iwl1000_lib,
        .hcmd = &iwl5000_hcmd,
        .utils = &iwl5000_hcmd_utils,