From patchwork Mon Jul 27 18:56:24 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Rodriguez X-Patchwork-Id: 37611 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n6RIuWv9019461 for ; Mon, 27 Jul 2009 18:56:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752266AbZG0S4b (ORCPT ); Mon, 27 Jul 2009 14:56:31 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751596AbZG0S4b (ORCPT ); Mon, 27 Jul 2009 14:56:31 -0400 Received: from mail.atheros.com ([12.36.123.2]:31579 "EHLO mail.atheros.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751307AbZG0S4a (ORCPT ); Mon, 27 Jul 2009 14:56:30 -0400 Received: from mail.atheros.com ([10.10.20.105]) by sidewinder.atheros.com for ; Mon, 27 Jul 2009 11:56:31 -0700 Received: from smtp.atheros.com (10.10.18.125) by SC1EXHC-01.global.atheros.com (10.10.20.111) with Microsoft SMTP Server (TLS) id 8.0.751.0; Mon, 27 Jul 2009 11:56:30 -0700 Received: by smtp.atheros.com (sSMTP sendmail emulation); Mon, 27 Jul 2009 11:56:30 -0700 From: "Luis R. Rodriguez" To: CC: , "Luis R. Rodriguez" , Kalle Valo Subject: [PATCH 2/2] at76c50x-usb: cancel scan work at stop callback Date: Mon, 27 Jul 2009 11:56:24 -0700 Message-ID: <1248720984-15922-3-git-send-email-lrodriguez@atheros.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1248720984-15922-1-git-send-email-lrodriguez@atheros.com> References: <1248720984-15922-1-git-send-email-lrodriguez@atheros.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org This should fix suspend as mac80211 expects all work queued to the mac80211 workqueue to be canceled at driver stop(). Cc: Kalle Valo Signed-off-by: Luis R. Rodriguez Acked-by: Kalle Valo --- drivers/net/wireless/at76c50x-usb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c index bbf5277..f46e2b3 100644 --- a/drivers/net/wireless/at76c50x-usb.c +++ b/drivers/net/wireless/at76c50x-usb.c @@ -1773,6 +1773,7 @@ static void at76_mac80211_stop(struct ieee80211_hw *hw) at76_dbg(DBG_MAC80211, "%s()", __func__); + cancel_delayed_work(&priv->dwork_hw_scan); cancel_work_sync(&priv->work_set_promisc); mutex_lock(&priv->mtx); @@ -2298,7 +2299,6 @@ static void at76_delete_device(struct at76_priv *priv) tasklet_kill(&priv->rx_tasklet); if (priv->mac80211_registered) { - cancel_delayed_work(&priv->dwork_hw_scan); flush_workqueue(priv->hw->workqueue); ieee80211_unregister_hw(priv->hw); }