diff --git a/[refs] b/[refs] index a516f5beaf4b..8826024284c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3756a89f3d039d8a6aa2556f8d57d4b2ec25d5dd +refs/heads/master: 44861f4455a77beaec2e53459c77b7fb0eda91a7 diff --git a/trunk/drivers/net/ethernet/brocade/bna/bnad.c b/trunk/drivers/net/ethernet/brocade/bna/bnad.c index bdfda0779a84..6ad4b477a4ef 100644 --- a/trunk/drivers/net/ethernet/brocade/bna/bnad.c +++ b/trunk/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 @@ bnad_pci_probe(struct pci_dev *pdev, 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; }