Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "cnss2: Use cnss_fatal_err print for fatal errors"

Browse source
This commit is contained in:
qctecmdr Service 2019-03-26 07:48:59 -07:00 committed by Gerrit - the friendly Code Review server
commit 688fc3888c
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/net/wireless/cnss2/pci.c
View file

@ -620,7 +620,7 @@ static int cnss_qca6290_powerup(struct cnss_pci_data *pci_priv)
ret = cnss_pci_start_mhi(pci_priv);
if (ret) {
cnss_pr_err("Failed to start MHI, err = %d\n", ret);
cnss_fatal_err("Failed to start MHI, err = %d\n", ret);
if (!test_bit(CNSS_DEV_ERR_NOTIFY, &plat_priv->driver_state) &&
!pci_priv->pci_link_down_ind && timeout)
mod_timer(&plat_priv->fw_boot_timer,
@ -1658,7 +1658,7 @@ int cnss_pci_force_fw_assert_hdlr(struct cnss_pci_data *pci_priv)
ret = cnss_pci_set_mhi_state(pci_priv, CNSS_MHI_TRIGGER_RDDM);
if (ret) {
cnss_pr_err("Failed to trigger RDDM, err = %d\n", ret);
cnss_fatal_err("Failed to trigger RDDM, err = %d\n", ret);
cnss_schedule_recovery(&pci_priv->pci_dev->dev,
CNSS_REASON_DEFAULT);
return ret;
@ -2149,7 +2149,8 @@ void cnss_pci_collect_dump_info(struct cnss_pci_data *pci_priv, bool in_panic)
ret = mhi_download_rddm_img(pci_priv->mhi_ctrl, in_panic);
if (ret) {
cnss_pr_err("Failed to download RDDM image, err = %d\n", ret);
cnss_fatal_err("Failed to download RDDM image, err = %d\n",
ret);
cnss_pci_dump_registers(pci_priv);
return;
}