From patchwork Mon Nov 30 17:13:34 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Lennert Buytenhek <buytenh@wantstofly.org>
X-Patchwork-Id: 63734
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 nAUHDZwN017653
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Mon, 30 Nov 2009 17:13:36 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753058AbZK3RN2 (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Mon, 30 Nov 2009 12:13:28 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753049AbZK3RN2
	(ORCPT <rfc822;linux-wireless-outgoing>);
	Mon, 30 Nov 2009 12:13:28 -0500
Received: from fw.wantstofly.org ([80.101.37.227]:57159 "EHLO
	mail.wantstofly.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752993AbZK3RN2 (ORCPT
	<rfc822;linux-wireless@vger.kernel.org>);
	Mon, 30 Nov 2009 12:13:28 -0500
Received: by mail.wantstofly.org (Postfix, from userid 500)
	id 0C1EB18E201; Mon, 30 Nov 2009 18:13:34 +0100 (CET)
Date: Mon, 30 Nov 2009 18:13:34 +0100
From: Lennert Buytenhek <buytenh@wantstofly.org>
To: "John W. Linville" <linville@tuxdriver.com>,
	linux-wireless@vger.kernel.org
Subject: [PATCH 09/12] mwl8k: don't forget to call pci_disable_device()
Message-ID: <20091130171334.GL20214@mail.wantstofly.org>
Mime-Version: 1.0
Content-Disposition: inline
User-Agent: Mutt/1.4.2.2i
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org


diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index b3eba35..5e67ae9 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -3378,7 +3378,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
 	if (rc) {
 		printk(KERN_ERR "%s: Cannot obtain PCI resources\n",
 		       MWL8K_NAME);
-		return rc;
+		goto err_disable_device;
 	}
 
 	pci_set_master(pdev);
@@ -3609,6 +3609,8 @@ err_iounmap:
 
 err_free_reg:
 	pci_release_regions(pdev);
+
+err_disable_device:
 	pci_disable_device(pdev);
 
 	return rc;