| Message ID | 20110824112922.GC5975@shale.localdomain |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
>From: Dan Carpenter [mailto:error27@gmail.com] >Sent: Wednesday, August 24, 2011 4:29 AM > >We introduced a new lock here, so there was error path which needs >an unlock now. > >Signed-off-by: Dan Carpenter <error27@gmail.com> > >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; > } Acked-by: Rasesh Mody <rmody@brocade.com> Thanks, Rasesh -- 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
From: Dan Carpenter <error27@gmail.com> Date: Wed, 24 Aug 2011 14:29:22 +0300 > We introduced a new lock here, so there was error path which needs > an unlock now. > > Signed-off-by: Dan Carpenter <error27@gmail.com> Applied. -- 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; }
We introduced a new lock here, so there was error path which needs an unlock now. Signed-off-by: Dan Carpenter <error27@gmail.com> -- 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