aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorHolger Schurig <hs4233@mail.mn-solutions.de>2008-04-30 10:50:07 +0200
committerJohn W. Linville <linville@tuxdriver.com>2008-05-07 15:02:26 -0400
commit5f505d90250c136e1cf63e3ae85e7d3ff3077c1d (patch)
treed92f225ad5f0598e29d7e84074d34cc3dd9f39b7 /drivers/net
parente100bb64bf7cdeae7f742a65ee1985649a7fd1b4 (diff)
downloadkernel_samsung_smdk4412-5f505d90250c136e1cf63e3ae85e7d3ff3077c1d.zip
kernel_samsung_smdk4412-5f505d90250c136e1cf63e3ae85e7d3ff3077c1d.tar.gz
kernel_samsung_smdk4412-5f505d90250c136e1cf63e3ae85e7d3ff3077c1d.tar.bz2
libertas: debug output tweaks for lbs_thread
* make debug output match the variable name * always report that lbs_remove_rtap() has has been exited Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de> Acked-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/libertas/main.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 406f54d..b1c9f33 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -702,7 +702,7 @@ static int lbs_thread(void *data)
if (shouldsleep) {
lbs_deb_thread("sleeping, connect_status %d, "
- "ps_mode %d, ps_state %d\n",
+ "psmode %d, psstate %d\n",
priv->connect_status,
priv->psmode, priv->psstate);
spin_unlock_irq(&priv->driver_lock);
@@ -1532,10 +1532,11 @@ static void lbs_remove_rtap(struct lbs_private *priv)
{
lbs_deb_enter(LBS_DEB_MAIN);
if (priv->rtap_net_dev == NULL)
- return;
+ goto out;
unregister_netdev(priv->rtap_net_dev);
free_netdev(priv->rtap_net_dev);
priv->rtap_net_dev = NULL;
+out:
lbs_deb_leave(LBS_DEB_MAIN);
}