diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-11-15 22:59:07 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-11-15 22:59:07 -0800 |
| commit | 37b12613661fbdea2f13e287947db5a1d44b6eb0 (patch) | |
| tree | 73a885d04fac9030e82700aaf42358f142b6fb87 | |
| parent | 3fcf84534df4225a45add545cdf3d55a1723ca05 (diff) | |
| parent | e268d7d64cdbab29d03fd80710ecf8e909c49018 (diff) | |
Merge "cnss2: cnss_bus_get_wake_irq should return int"
| -rw-r--r-- | drivers/net/wireless/cnss2/bus.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/cnss2/bus.h | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/cnss2/qmi.c | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/wireless/cnss2/bus.c b/drivers/net/wireless/cnss2/bus.c index 17da90259084..4587d4ef162f 100644 --- a/drivers/net/wireless/cnss2/bus.c +++ b/drivers/net/wireless/cnss2/bus.c @@ -162,7 +162,7 @@ int cnss_bus_alloc_fw_mem(struct cnss_plat_data *plat_priv) } } -u32 cnss_bus_get_wake_irq(struct cnss_plat_data *plat_priv) +int cnss_bus_get_wake_irq(struct cnss_plat_data *plat_priv) { if (!plat_priv) return -ENODEV; diff --git a/drivers/net/wireless/cnss2/bus.h b/drivers/net/wireless/cnss2/bus.h index 415f1ae6cfed..ff5f5a85469e 100644 --- a/drivers/net/wireless/cnss2/bus.h +++ b/drivers/net/wireless/cnss2/bus.h @@ -42,7 +42,7 @@ int cnss_bus_init(struct cnss_plat_data *plat_priv); void cnss_bus_deinit(struct cnss_plat_data *plat_priv); int cnss_bus_load_m3(struct cnss_plat_data *plat_priv); int cnss_bus_alloc_fw_mem(struct cnss_plat_data *plat_priv); -u32 cnss_bus_get_wake_irq(struct cnss_plat_data *plat_priv); +int cnss_bus_get_wake_irq(struct cnss_plat_data *plat_priv); int cnss_bus_force_fw_assert_hdlr(struct cnss_plat_data *plat_priv); void cnss_bus_fw_boot_timeout_hdlr(unsigned long data); void cnss_bus_collect_dump_info(struct cnss_plat_data *plat_priv); diff --git a/drivers/net/wireless/cnss2/qmi.c b/drivers/net/wireless/cnss2/qmi.c index fb2841360265..85701566c58c 100644 --- a/drivers/net/wireless/cnss2/qmi.c +++ b/drivers/net/wireless/cnss2/qmi.c @@ -164,8 +164,9 @@ static int cnss_wlfw_host_cap_send_sync(struct cnss_plat_data *plat_priv) req.num_clients = daemon_support ? 2 : 1; cnss_pr_dbg("Number of clients is %d\n", req.num_clients); - req.wake_msi = cnss_bus_get_wake_irq(plat_priv); - if (req.wake_msi) { + ret = cnss_bus_get_wake_irq(plat_priv); + if (ret > 0) { + req.wake_msi = ret; cnss_pr_dbg("WAKE MSI base data is %d\n", req.wake_msi); req.wake_msi_valid = 1; } |