diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-06-06 23:35:12 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-06-06 23:35:12 -0700 |
| commit | 074cdf9e72eba93c15067460f359be6f18a78208 (patch) | |
| tree | e8069c481406aec5852138cd8418d1366483740a | |
| parent | f73796d0e9f6a1d000bde953e735481ffd3fed95 (diff) | |
| parent | e405d025f37341412add31ebec8b76744a349e5c (diff) | |
Merge "cnss2: Return failure if bus type do not match"
| -rw-r--r-- | drivers/net/wireless/cnss2/pci.c | 6 | ||||
| -rw-r--r-- | drivers/net/wireless/cnss2/usb.c | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/wireless/cnss2/pci.c b/drivers/net/wireless/cnss2/pci.c index 3926023a1493..7dc419753a80 100644 --- a/drivers/net/wireless/cnss2/pci.c +++ b/drivers/net/wireless/cnss2/pci.c @@ -749,6 +749,12 @@ int cnss_wlan_register_driver(struct cnss_wlan_driver *driver_ops) return -ENODEV; } + if (plat_priv->bus_type != CNSS_BUS_PCI) { + cnss_pr_err("Wrong bus type. Expected bus_type %d\n", + plat_priv->bus_type); + return -EFAULT; + } + pci_priv = plat_priv->bus_priv; if (!pci_priv) { cnss_pr_err("pci_priv is NULL\n"); diff --git a/drivers/net/wireless/cnss2/usb.c b/drivers/net/wireless/cnss2/usb.c index a15f967f986d..3d3932371b26 100644 --- a/drivers/net/wireless/cnss2/usb.c +++ b/drivers/net/wireless/cnss2/usb.c @@ -73,6 +73,12 @@ int cnss_usb_wlan_register_driver(struct cnss_usb_wlan_driver *driver_ops) return -ENODEV; } + if (plat_priv->bus_type != CNSS_BUS_USB) { + cnss_pr_err("Wrong bus type. Expected bus_type %d\n", + plat_priv->bus_type); + return -EFAULT; + } + usb_priv = plat_priv->bus_priv; usb_priv->plat_priv = plat_priv; |