diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-03-21 22:02:04 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-03-21 22:02:04 +0400 |
| commit | 49c0ca17ee8dd3530f688052d4eb2ae6d3e55119 (patch) | |
| tree | 251a4c566723b60505234a18ed864763ad0d0506 /drivers/net/wireless/ath/wil6210/pcie_bus.c | |
| parent | a85ae0e97879f51bccd8511668b07d346d98b3eb (diff) | |
| parent | 67b3bd4e65f0854aca70e0134d59b1daede49504 (diff) | |
| download | linux-49c0ca17ee8dd3530f688052d4eb2ae6d3e55119.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/ath/wil6210/pcie_bus.c')
| -rw-r--r-- | drivers/net/wireless/ath/wil6210/pcie_bus.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/wil6210/pcie_bus.c b/drivers/net/wireless/ath/wil6210/pcie_bus.c index e1c8cc4a4b92..f1e1bb338d68 100644 --- a/drivers/net/wireless/ath/wil6210/pcie_bus.c +++ b/drivers/net/wireless/ath/wil6210/pcie_bus.c @@ -68,10 +68,14 @@ static int wil_if_pcie_enable(struct wil6210_priv *wil) goto stop_master; /* need reset here to obtain MAC */ + mutex_lock(&wil->mutex); rc = wil_reset(wil); + mutex_unlock(&wil->mutex); if (rc) goto release_irq; + wil_info(wil, "HW version: 0x%08x\n", wil->hw_version); + return 0; release_irq: @@ -149,6 +153,7 @@ static int wil_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id) pci_set_drvdata(pdev, wil); wil->pdev = pdev; + wil6210_clear_irq(wil); /* FW should raise IRQ when ready */ rc = wil_if_pcie_enable(wil); if (rc) { |