summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRajasekaran Kalidoss <rkalidos@codeaurora.org>2018-09-18 17:24:21 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2019-01-15 06:53:12 -0800
commitd76cb454edb95110fe40fa303c97275f35e57966 (patch)
tree8ded56f94121434fd7326a772d0a75fc68a53e5f
parenteb84e2653d597ed5daccf3c901d797ac8ef13de5 (diff)
cnss2: USB:skip ce config for USB transport
For USB transport, ce config request should not be sent. In cnss_wlan_enable, skip ce config if bus type is USB. Change-Id: Icf7c2a7c01c4b93a0856442f8a78d733a9858183 Signed-off-by: Rajasekaran Kalidoss <rkalidos@codeaurora.org>
-rw-r--r--drivers/net/wireless/cnss2/bus.c4
-rw-r--r--drivers/net/wireless/cnss2/main.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/cnss2/bus.c b/drivers/net/wireless/cnss2/bus.c
index 4587d4ef162f..d8d8d5b75853 100644
--- a/drivers/net/wireless/cnss2/bus.c
+++ b/drivers/net/wireless/cnss2/bus.c
@@ -25,6 +25,8 @@ enum cnss_dev_bus_type cnss_get_dev_bus_type(struct device *dev)
if (memcmp(dev->bus->name, "pci", 3) == 0)
return CNSS_BUS_PCI;
+ else if (memcmp(dev->bus->name, "usb", 3) == 0)
+ return CNSS_BUS_USB;
else
return CNSS_BUS_NONE;
}
@@ -72,6 +74,8 @@ void *cnss_bus_dev_to_bus_priv(struct device *dev)
switch (cnss_get_dev_bus_type(dev)) {
case CNSS_BUS_PCI:
return cnss_get_pci_priv(to_pci_dev(dev));
+ case CNSS_BUS_USB:
+ return cnss_get_usb_priv(to_usb_interface(dev));
default:
return NULL;
}
diff --git a/drivers/net/wireless/cnss2/main.c b/drivers/net/wireless/cnss2/main.c
index 9c1b29fc6e27..249e3da75c98 100644
--- a/drivers/net/wireless/cnss2/main.c
+++ b/drivers/net/wireless/cnss2/main.c
@@ -259,6 +259,9 @@ int cnss_wlan_enable(struct device *dev,
if (qmi_bypass)
return 0;
+ if (cnss_get_bus_type(plat_priv->device_id) == CNSS_BUS_USB)
+ goto skip_cfg;
+
if (!config || !host_version) {
cnss_pr_err("Invalid config or host_version pointer\n");
return -EINVAL;