Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0caa9aae authored by Rasesh Mody's avatar Rasesh Mody Committed by David S. Miller
Browse files

bna: PCI Probe Fix 



Change details:
 - Return error as -EIO if bnad_res_alloc fails
 - Release the configuration lock before registering with net_device layer.

Signed-off-by: default avatarGurunatha Karaje <gkaraje@brocade.com>
Signed-off-by: default avatarRasesh Mody <rmody@brocade.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 772b5235

drivers/net/ethernet/brocade/bna/bnad.c

+7 −1
Original line number Diff line number Diff line
@@ -3253,8 +3253,10 @@ bnad_pci_probe(struct pci_dev *pdev, 
	spin_unlock_irqrestore(&bnad->bna_lock, flags);



	err = bnad_res_alloc(bnad, &bnad->mod_res_info[0], BNA_MOD_RES_T_MAX);

	if (err)

	if (err) {

		err = -EIO;

		goto disable_ioceth;

	}



	spin_lock_irqsave(&bnad->bna_lock, flags);

	bna_mod_init(&bnad->bna, &bnad->mod_res_info[0]);
@@ -3266,6 +3268,8 @@ bnad_pci_probe(struct pci_dev *pdev, 
	bnad_set_netdev_perm_addr(bnad);

	spin_unlock_irqrestore(&bnad->bna_lock, flags);



	mutex_unlock(&bnad->conf_mutex);



	/* Finally, reguister with net_device layer */

	err = register_netdev(netdev);

	if (err) {
@@ -3274,6 +3278,8 @@ bnad_pci_probe(struct pci_dev *pdev, 
	}

	set_bit(BNAD_RF_NETDEV_REGISTERED, &bnad->run_flags);



	return 0;



probe_success:

	mutex_unlock(&bnad->conf_mutex);

	return 0;