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

cnss2: call remove driver_ops in cnss_wlan_unregister

Browse source 
rmmod of wlan triggers cnss_wlan_unregister. wlan driver_ops
remove should be called for QCN7605 standalone and
composite devices to finish the rmmod path.

Change-Id: I0047eb65b68b7e81b9b9c9fd79825a0d3f27c640
Signed-off-by: Rajasekaran Kalidoss <rkalidos@codeaurora.org>
This commit is contained in:
Rajasekaran Kalidoss 2018-10-26 08:43:54 +05:30 • committed by Gerrit - the friendly Code Review server
parent 0773fb50d4
commit 7a18627fbf
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -108,6 +108,7 @@ int cnss_usb_dev_shutdown(struct cnss_usb_data *usb_priv)
switch (usb_priv->device_id) { switch (usb_priv->device_id) {
case QCN7605_COMPOSITE_DEVICE_ID: case QCN7605_COMPOSITE_DEVICE_ID:
case QCN7605_STANDALONE_DEVICE_ID: case QCN7605_STANDALONE_DEVICE_ID:
cnss_usb_call_driver_remove(usb_priv);
break; break;
default: default:
cnss_pr_err("Unknown device_id found: 0x%x\n", cnss_pr_err("Unknown device_id found: 0x%x\n",
@ -175,12 +176,13 @@ int cnss_usb_call_driver_remove(struct cnss_usb_data *usb_priv)
if (test_bit(CNSS_DRIVER_RECOVERY, &plat_priv->driver_state) && if (test_bit(CNSS_DRIVER_RECOVERY, &plat_priv->driver_state) &&
test_bit(CNSS_DRIVER_PROBED, &plat_priv->driver_state)) { test_bit(CNSS_DRIVER_PROBED, &plat_priv->driver_state)) {
cnss_pr_dbg("Recovery set after driver probed.Call shutdown\n");
usb_priv->driver_ops->shutdown(usb_priv->usb_intf); usb_priv->driver_ops->shutdown(usb_priv->usb_intf);
} else if (test_bit(CNSS_DRIVER_UNLOADING, &plat_priv->driver_state)) { } else if (test_bit(CNSS_DRIVER_UNLOADING, &plat_priv->driver_state)) {
cnss_pr_dbg("driver_ops->remove\n");
usb_priv->driver_ops->remove(usb_priv->usb_intf); usb_priv->driver_ops->remove(usb_priv->usb_intf);
clear_bit(CNSS_DRIVER_PROBED, &plat_priv->driver_state); clear_bit(CNSS_DRIVER_PROBED, &plat_priv->driver_state);
} }
return 0; return 0;
} }