From patchwork Sat Aug 21 19:24:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 121931 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7LJPi2B008412 for ; Sat, 21 Aug 2010 19:25:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752033Ab0HUTZb (ORCPT ); Sat, 21 Aug 2010 15:25:31 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:48718 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751838Ab0HUTZa (ORCPT ); Sat, 21 Aug 2010 15:25:30 -0400 Received: by wyb32 with SMTP id 32so5130059wyb.19 for ; Sat, 21 Aug 2010 12:25:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=uuDOQql+bgUg5wUqgiMVSgYuzBfvBhQggne9ZsqVbdo=; b=PQ/sjPD1fk+uxUbzrVo4PO8THoXL32Lg93HWqhWEgH2kRlOhXA3sK8RNb8/rUeJOmB hDQz8D9u7ASPhsch+Wr6YF6dVRA8GSbX9aXGtW5IykzMxO0yAhtHyEzmvtuicYgXPi6M qPpLZsSRQQ6owaTWj3JYRCmXcb7w1HTttpDCQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=qE8slNSoi+kLwvvl2yFcjQQP9eXhCjkKBxxeiCrIn7kvOoJHcTFCk8H6HkxYBAyLi5 pJOAc0pz2NlqlsHRWWxVjfh883YFZhNQuNrAlAJwU5TC24ykKqvPdN79x30pEyHDbuh9 asi6810LtECvhN8jdsi/+LrPHuNd3pWvbWVxs= Received: by 10.227.155.135 with SMTP id s7mr2799364wbw.100.1282418728665; Sat, 21 Aug 2010 12:25:28 -0700 (PDT) Received: from bicker ([41.205.146.22]) by mx.google.com with ESMTPS id a1sm3723121wbb.2.2010.08.21.12.25.10 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 21 Aug 2010 12:25:27 -0700 (PDT) Date: Sat, 21 Aug 2010 21:24:59 +0200 From: Dan Carpenter To: Jiri Slaby Cc: Nick Kossifidis , "Luis R. Rodriguez" , Bob Copeland , "John W. Linville" , Bruno Randolf , linux-wireless@vger.kernel.org, ath5k-devel@venema.h4ckr.net, kernel-janitors@vger.kernel.org Subject: [patch] ath5k: re-order one of the frees on unwind Message-ID: <20100821192459.GG6674@bicker> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) 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 (demeter.kernel.org [140.211.167.41]); Sat, 21 Aug 2010 19:25:44 +0000 (UTC) diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c index 373dcfe..2447507 100644 --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c @@ -700,10 +700,10 @@ ath5k_pci_probe(struct pci_dev *pdev, return 0; err_ah: ath5k_hw_detach(sc->ah); -err_irq: - free_irq(pdev->irq, sc); err_free_ah: kfree(sc->ah); +err_irq: + free_irq(pdev->irq, sc); err_free: ieee80211_free_hw(hw); err_map: