diff options
| author | John W. Linville | 2012-11-16 20:08:14 +0100 |
|---|---|---|
| committer | John W. Linville | 2012-11-16 20:08:14 +0100 |
| commit | 1e5023c7cc11158f74a637aa92897da954572a25 (patch) | |
| tree | a0b2234b331abf9b2c80dbce20a018d537e541a6 /drivers/net/wireless/ath/ath6kl/hif.c | |
| parent | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlw... (diff) | |
| parent | ath6kl: support NL80211_USER_REG_HINT_CELL_BASE events (diff) | |
| download | kernel-qcow2-linux-1e5023c7cc11158f74a637aa92897da954572a25.tar.gz kernel-qcow2-linux-1e5023c7cc11158f74a637aa92897da954572a25.tar.xz kernel-qcow2-linux-1e5023c7cc11158f74a637aa92897da954572a25.zip | |
Merge branch 'for-linville' of git://github.com/kvalo/ath6kl
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl/hif.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath6kl/hif.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/hif.c b/drivers/net/wireless/ath/ath6kl/hif.c index 9e47c4a138a7..a6b614421fa4 100644 --- a/drivers/net/wireless/ath/ath6kl/hif.c +++ b/drivers/net/wireless/ath/ath6kl/hif.c @@ -136,6 +136,7 @@ static int ath6kl_hif_proc_dbg_intr(struct ath6kl_device *dev) ath6kl_hif_dump_fw_crash(dev->ar); ath6kl_read_fwlogs(dev->ar); + ath6kl_recovery_err_notify(dev->ar, ATH6KL_FW_ASSERT); return ret; } @@ -693,11 +694,6 @@ int ath6kl_hif_setup(struct ath6kl_device *dev) ath6kl_dbg(ATH6KL_DBG_HIF, "hif block size %d mbox addr 0x%x\n", dev->htc_cnxt->block_sz, dev->ar->mbox_info.htc_addr); - /* usb doesn't support enabling interrupts */ - /* FIXME: remove check once USB support is implemented */ - if (dev->ar->hif_type == ATH6KL_HIF_TYPE_USB) - return 0; - status = ath6kl_hif_disable_intrs(dev); fail_setup: |