From patchwork Sat May 7 15:27:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivo van Doorn X-Patchwork-Id: 764492 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p47FSFqS006626 for ; Sat, 7 May 2011 15:28:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755417Ab1EGP2O (ORCPT ); Sat, 7 May 2011 11:28:14 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:49960 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755384Ab1EGP2N (ORCPT ); Sat, 7 May 2011 11:28:13 -0400 Received: by eyx24 with SMTP id 24so1215677eyx.19 for ; Sat, 07 May 2011 08:28:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:subject:date:user-agent:cc:mime-version :message-id:content-type:content-transfer-encoding; bh=DQeq/+dNbiebHVAQItFKR0mDcXy946rxdPvqYWHc6Mo=; b=PYzxnWaS2Y7N1jV4pux6m0NuYVf6wR9G25Ow6pbtk4hhfQK7MOwiNiJhq5ZFXGE7/9 9+YYNMxvxTauEUwshQpEPDHUtVRas5g3uSByWj3kUDCp0GRnZXArYq60V7UN3HtSXc1N CcIl1mIPRCcU6e6eWITdqvR46ZTIjv/QrLWfY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:mime-version:message-id :content-type:content-transfer-encoding; b=W+sdRFVmXAA77aCrT6FAyV3lh99Ol76budqMdpKpaZoURAoSpocq2NSF07AGrHUezk 0PowYu8YBfUacjcnM7y7o8tgRinrpz9ouWZyJ5Bm3no80iQbIaRfxoU7GnL9Ap2DQ7aW gnauV2PewZ2/PfX/T/jec2qFJ7jURqVF3V+Ko= Received: by 10.14.43.218 with SMTP id l66mr2468337eeb.188.1304782092177; Sat, 07 May 2011 08:28:12 -0700 (PDT) Received: from localhost.localdomain (g121037.upc-g.chello.nl [80.57.121.37]) by mx.google.com with ESMTPS id z48sm2141458eez.6.2011.05.07.08.28.10 (version=SSLv3 cipher=OTHER); Sat, 07 May 2011 08:28:11 -0700 (PDT) From: Ivo van Doorn To: "John W. Linville" Subject: [PATCH] rt2x00: Fix rmmod hang of rt2800pci Date: Sat, 7 May 2011 17:27:46 +0200 User-Agent: KMail/1.13.5 (Linux/2.6.32.26-175.fc12.x86_64; KDE/4.4.5; x86_64; ; ) Cc: users@rt2x00.serialmonkey.com, linux-wireless@vger.kernel.org MIME-Version: 1.0 Message-Id: <201105071727.46998.IvDoorn@gmail.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.6 (demeter2.kernel.org [140.211.167.43]); Sat, 07 May 2011 15:28:16 +0000 (UTC) From: Gertjan van Wingerde txstatus_timer should only be deleted for USB devices, as it is only initialized for USB devices. Reported-by: Andreas Hartmann Signed-off-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn --- drivers/net/wireless/rt2x00/rt2x00dev.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index 2eb5196..c018d67 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c @@ -1159,9 +1159,9 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev) /* * Stop all work. */ - del_timer_sync(&rt2x00dev->txstatus_timer); cancel_work_sync(&rt2x00dev->intf_work); if (rt2x00_is_usb(rt2x00dev)) { + del_timer_sync(&rt2x00dev->txstatus_timer); cancel_work_sync(&rt2x00dev->rxdone_work); cancel_work_sync(&rt2x00dev->txdone_work); }