From patchwork Wed Aug 24 11:29:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 111322 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AA6E3B6F65 for ; Wed, 24 Aug 2011 21:31:47 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754769Ab1HXLbl (ORCPT ); Wed, 24 Aug 2011 07:31:41 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:41217 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751395Ab1HXLbk (ORCPT ); Wed, 24 Aug 2011 07:31:40 -0400 Received: by wwf5 with SMTP id 5so1104356wwf.1 for ; Wed, 24 Aug 2011 04:31:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=ewVBAhkVMlYk7f8eVddb45IrshoH6J29+oJTnb1/aRk=; b=dehL7EwiQC99Bun+XDQxb+brUq9drC8mD9gM0tV3NMqSAYbDCZXvskWToITrLO+tIF 7blzr4oEt5PkX3qitJgSzIk9mWhD28BUE+xJv8vL1GRVLB3rsYDRcu/3icEkxlB7yRMG p2e5SQkwrBf12GL54aR/oEjhvIq1i5s4aO/6U= Received: by 10.227.42.145 with SMTP id s17mr1250806wbe.95.1314185499199; Wed, 24 Aug 2011 04:31:39 -0700 (PDT) Received: from shale.localdomain ([212.49.88.34]) by mx.google.com with ESMTPS id n20sm764099wbh.16.2011.08.24.04.31.34 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Aug 2011 04:31:38 -0700 (PDT) Date: Wed, 24 Aug 2011 14:29:22 +0300 From: Dan Carpenter To: Rasesh Mody Cc: Debashis Dutt , "open list:BROCADE BNA 10 GI..." , kernel-janitors@vger.kernel.org Subject: [patch -next] bna: unlock on error path in pnad_pci_probe() Message-ID: <20110824112922.GC5975@shale.localdomain> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We introduced a new lock here, so there was error path which needs an unlock now. Signed-off-by: Dan Carpenter Acked-by: Rasesh Mody --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c index bdfda07..6ad4b47 100644 --- a/drivers/net/ethernet/brocade/bna/bnad.c +++ b/drivers/net/ethernet/brocade/bna/bnad.c @@ -3167,7 +3167,7 @@ bnad_pci_probe(struct pci_dev *pdev, */ err = bnad_pci_init(bnad, pdev, &using_dac); if (err) - goto free_netdev; + goto unlock_mutex; /* * Initialize bnad structure @@ -3296,9 +3296,9 @@ drv_uninit: bnad_uninit(bnad); pci_uninit: bnad_pci_uninit(pdev); +unlock_mutex: mutex_unlock(&bnad->conf_mutex); bnad_lock_uninit(bnad); -free_netdev: free_netdev(netdev); return err; }