aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath6kl/hif.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl/hif.c')
-rw-r--r--drivers/net/wireless/ath/ath6kl/hif.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/hif.c b/drivers/net/wireless/ath/ath6kl/hif.c
index 68ed6c2665b..a6b614421fa 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)
136 136
137 ath6kl_hif_dump_fw_crash(dev->ar); 137 ath6kl_hif_dump_fw_crash(dev->ar);
138 ath6kl_read_fwlogs(dev->ar); 138 ath6kl_read_fwlogs(dev->ar);
139 ath6kl_recovery_err_notify(dev->ar, ATH6KL_FW_ASSERT);
139 140
140 return ret; 141 return ret;
141} 142}
@@ -338,8 +339,7 @@ static int ath6kl_hif_proc_err_intr(struct ath6kl_device *dev)
338 status = hif_read_write_sync(dev->ar, ERROR_INT_STATUS_ADDRESS, 339 status = hif_read_write_sync(dev->ar, ERROR_INT_STATUS_ADDRESS,
339 reg_buf, 4, HIF_WR_SYNC_BYTE_FIX); 340 reg_buf, 4, HIF_WR_SYNC_BYTE_FIX);
340 341
341 if (status) 342 WARN_ON(status);
342 WARN_ON(1);
343 343
344 return status; 344 return status;
345} 345}
@@ -383,8 +383,7 @@ static int ath6kl_hif_proc_cpu_intr(struct ath6kl_device *dev)
383 status = hif_read_write_sync(dev->ar, CPU_INT_STATUS_ADDRESS, 383 status = hif_read_write_sync(dev->ar, CPU_INT_STATUS_ADDRESS,
384 reg_buf, 4, HIF_WR_SYNC_BYTE_FIX); 384 reg_buf, 4, HIF_WR_SYNC_BYTE_FIX);
385 385
386 if (status) 386 WARN_ON(status);
387 WARN_ON(1);
388 387
389 return status; 388 return status;
390} 389}
@@ -695,11 +694,6 @@ int ath6kl_hif_setup(struct ath6kl_device *dev)
695 ath6kl_dbg(ATH6KL_DBG_HIF, "hif block size %d mbox addr 0x%x\n", 694 ath6kl_dbg(ATH6KL_DBG_HIF, "hif block size %d mbox addr 0x%x\n",
696 dev->htc_cnxt->block_sz, dev->ar->mbox_info.htc_addr); 695 dev->htc_cnxt->block_sz, dev->ar->mbox_info.htc_addr);
697 696
698 /* usb doesn't support enabling interrupts */
699 /* FIXME: remove check once USB support is implemented */
700 if (dev->ar->hif_type == ATH6KL_HIF_TYPE_USB)
701 return 0;
702
703 status = ath6kl_hif_disable_intrs(dev); 697 status = ath6kl_hif_disable_intrs(dev);
704 698
705fail_setup: 699fail_setup: