evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cnss2: Fix for WL_EN toggling failure

Browse source 
Regulator_enable API is getting called twice for wl_en.
But for wlan driver unload, regulator_disable gets called only once.
Hence SoC reset is not happening during the wlan driver unload.
Removed the second regulator_enable call in wlan driver load path.

Change-Id: Ic84a04a5ea01ddf81f27fcaa1579611655ccdd05
Signed-off-by: Jayachandran Sreekumaran <jsreekum@codeaurora.org>
This commit is contained in:
Jayachandran Sreekumaran 2019-11-13 14:19:04 +05:30
parent 9fbd3acbf7
commit de744b5eca
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/wireless/cnss2/bus.c
View file

@ -304,7 +304,7 @@ int cnss_bus_dev_shutdown(struct cnss_plat_data *plat_priv)
case CNSS_BUS_PCI: case CNSS_BUS_PCI:
return cnss_pci_dev_shutdown(plat_priv->bus_priv); return cnss_pci_dev_shutdown(plat_priv->bus_priv);
case CNSS_BUS_USB: case CNSS_BUS_USB:
return 0; return cnss_usb_dev_shutdown(plat_priv->bus_priv);
case CNSS_BUS_SDIO: case CNSS_BUS_SDIO:
return cnss_sdio_dev_shutdown(plat_priv->bus_priv); return cnss_sdio_dev_shutdown(plat_priv->bus_priv);
default: default:

4
drivers/net/wireless/cnss2/usb.c
View file

@ -54,7 +54,8 @@ int cnss_usb_dev_powerup(struct cnss_plat_data *plat_priv)
case QCN7605_STANDALONE_DEVICE_ID: case QCN7605_STANDALONE_DEVICE_ID:
case QCN7605_VER20_STANDALONE_DEVICE_ID: case QCN7605_VER20_STANDALONE_DEVICE_ID:
case QCN7605_VER20_COMPOSITE_DEVICE_ID: case QCN7605_VER20_COMPOSITE_DEVICE_ID:
ret = cnss_qcn7605_usb_powerup(plat_priv); if (test_bit(CNSS_DEV_REMOVED, &plat_priv->driver_state))
ret = cnss_qcn7605_usb_powerup(plat_priv);
break; break;
default: default:
cnss_pr_err("Unknown device_id found: %lu\n", cnss_pr_err("Unknown device_id found: %lu\n",
@ -160,7 +161,6 @@ int cnss_usb_unregister_driver_hdlr(struct cnss_usb_data *usb_priv)
set_bit(CNSS_DRIVER_UNLOADING, &plat_priv->driver_state); set_bit(CNSS_DRIVER_UNLOADING, &plat_priv->driver_state);
cnss_usb_dev_shutdown(usb_priv); cnss_usb_dev_shutdown(usb_priv);
usb_priv->driver_ops = NULL; usb_priv->driver_ops = NULL;
usb_priv->plat_priv = NULL;
return 0; return 0;
} }