From bb7bb922188a927af86e6aaf1743c8e00306e985 Mon Sep 17 00:00:00 2001 From: Eugene Teo Date: Sat, 19 May 2007 11:09:20 +0800 Subject: [PATCH] --- yaml --- r: 56944 b: refs/heads/master c: 596f2d0554352f1089f7478b309b27d8cdf5cd4f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/fw.c | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 5552fbc49433..eae6198b732c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d4bd24b019981394fabb465b0c7932924b83d65 +refs/heads/master: 596f2d0554352f1089f7478b309b27d8cdf5cd4f diff --git a/trunk/drivers/net/wireless/libertas/fw.c b/trunk/drivers/net/wireless/libertas/fw.c index 441123c85e62..5c63c9b1659c 100644 --- a/trunk/drivers/net/wireless/libertas/fw.c +++ b/trunk/drivers/net/wireless/libertas/fw.c @@ -333,18 +333,22 @@ static void command_timer_fn(unsigned long data) unsigned long flags; ptempnode = adapter->cur_cmd; + if (ptempnode == NULL) { + lbs_pr_debug(1, "PTempnode Empty\n"); + return; + } + cmd = (struct cmd_ds_command *)ptempnode->bufvirtualaddr; + if (!cmd) { + lbs_pr_debug(1, "cmd is NULL\n"); + return; + } lbs_pr_info("command_timer_fn fired (%x)\n", cmd->command); if (!adapter->fw_ready) return; - if (ptempnode == NULL) { - lbs_pr_debug(1, "PTempnode Empty\n"); - return; - } - spin_lock_irqsave(&adapter->driver_lock, flags); adapter->cur_cmd = NULL; spin_unlock_irqrestore(&adapter->driver_lock, flags);