From a17afd698d0cf3929caf954e5435938621c3847f Mon Sep 17 00:00:00 2001 From: Holger Schurig Date: Wed, 30 Apr 2008 10:50:07 +0200 Subject: [PATCH] --- yaml --- r: 102509 b: refs/heads/master c: 5f505d90250c136e1cf63e3ae85e7d3ff3077c1d h: refs/heads/master i: 102507: 52c44c0a586e1e552bd56c475b7496afe7b166f7 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/main.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ebebc4f69767..eb23208f9a46 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e100bb64bf7cdeae7f742a65ee1985649a7fd1b4 +refs/heads/master: 5f505d90250c136e1cf63e3ae85e7d3ff3077c1d diff --git a/trunk/drivers/net/wireless/libertas/main.c b/trunk/drivers/net/wireless/libertas/main.c index 406f54d40956..b1c9f3383d7a 100644 --- a/trunk/drivers/net/wireless/libertas/main.c +++ b/trunk/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); }