summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/cnss2/bus.c2
-rw-r--r--drivers/net/wireless/cnss2/usb.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/cnss2/bus.c b/drivers/net/wireless/cnss2/bus.c
index e33eb647d9bb..5d77d8db4d53 100644
--- a/drivers/net/wireless/cnss2/bus.c
+++ b/drivers/net/wireless/cnss2/bus.c
@@ -304,7 +304,7 @@ int cnss_bus_dev_shutdown(struct cnss_plat_data *plat_priv)
case CNSS_BUS_PCI:
return cnss_pci_dev_shutdown(plat_priv->bus_priv);
case CNSS_BUS_USB:
- return 0;
+ return cnss_usb_dev_shutdown(plat_priv->bus_priv);
case CNSS_BUS_SDIO:
return cnss_sdio_dev_shutdown(plat_priv->bus_priv);
default:
diff --git a/drivers/net/wireless/cnss2/usb.c b/drivers/net/wireless/cnss2/usb.c
index c647e0f8e9ba..c42ef2210a41 100644
--- a/drivers/net/wireless/cnss2/usb.c
+++ b/drivers/net/wireless/cnss2/usb.c
@@ -54,7 +54,8 @@ int cnss_usb_dev_powerup(struct cnss_plat_data *plat_priv)
case QCN7605_STANDALONE_DEVICE_ID:
case QCN7605_VER20_STANDALONE_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;
default:
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);
cnss_usb_dev_shutdown(usb_priv);
usb_priv->driver_ops = NULL;
- usb_priv->plat_priv = NULL;
return 0;
}