From patchwork Mon Sep 27 21:03:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 213432 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8RL3E17019424 for ; Mon, 27 Sep 2010 21:03:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759465Ab0I0VDM (ORCPT ); Mon, 27 Sep 2010 17:03:12 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:61206 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755319Ab0I0VDM (ORCPT ); Mon, 27 Sep 2010 17:03:12 -0400 Received: by fxm3 with SMTP id 3so2212882fxm.19 for ; Mon, 27 Sep 2010 14:03:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:received:from:to:subject:date :user-agent:cc:mime-version:content-type:content-transfer-encoding :message-id; bh=OCsK5/L5BIFbZOBRT6AiaIdEvgUQ+9K2kWKtfWqNju0=; b=k6AfAWz689z/RZjS42gxx5iT1I8z+JdoJgdSHvCZg1TRg3AFXdWcVUEZK4C3ZROTwc Ah9+pHLjyMXulpqJFIeMqDRuzJVmuSyyKjNiQB4helCz6z9+tO/XaKuY095QZRZm6MIX SZgbdho6wTSkLL/2QcAzWDR+RCDOnzRZ3T/Yk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=from:to:subject:date:user-agent:cc:mime-version:content-type :content-transfer-encoding:message-id; b=WCyKEMr6LTynTFk11BM+dwWEFQ+mVHz9TPcf0fI3YRZqc3IdVXLHNjpvUk+NNKReoS mFlD+e7l6A4GYFvl1onn2FkVrCGaq34fDDb2PcV8hVCUXDjb7sVuvm+GIf/4Dko0yTlN D99TMnjNXOiTWNJFkuy4KsaTrysnpIGEDx8PA= Received: by 10.223.101.18 with SMTP id a18mr1675713fao.19.1285621390375; Mon, 27 Sep 2010 14:03:10 -0700 (PDT) Received: from debian64.daheim (p549CB7E4.dip.t-dialin.net [84.156.183.228]) by mx.google.com with ESMTPS id 10sm2717769fax.18.2010.09.27.14.03.08 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 27 Sep 2010 14:03:09 -0700 (PDT) Received: from debian64.daheim ([192.168.0.4] helo=debian64.localnet ident=chuck) by debian64.daheim with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1P0Kqm-0002Kl-Lp; Mon, 27 Sep 2010 23:03:04 +0200 From: Christian Lamparter To: linux-wireless@vger.kernel.org Subject: [PATCH] carl9170: fix hung workqueue Date: Mon, 27 Sep 2010 23:03:01 +0200 User-Agent: KMail/1.13.5 (Linux/2.6.36-rc5-wl+; KDE/4.4.5; x86_64; ; ) Cc: "John W. Linville" MIME-Version: 1.0 Message-Id: <201009272303.01535.chunkeey@googlemail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 27 Sep 2010 21:03:14 +0000 (UTC) diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c index 84bd38e..d9d3e9c 100644 --- a/drivers/net/wireless/ath/carl9170/main.c +++ b/drivers/net/wireless/ath/carl9170/main.c @@ -515,7 +515,7 @@ void carl9170_restart(struct ar9170 *ar, const enum carl9170_restart_reasons r) return; if (IS_ACCEPTING_CMD(ar) && !ar->needs_full_reset) - ieee80211_queue_work(ar->hw, &ar->restart_work); + schedule_work(&ar->restart_work); else carl9170_usb_reset(ar);