Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e28ee477 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss2: Initialize params for error path"

parents f81e2b21 d14fbadb

drivers/net/wireless/cnss2/main.c

+4 −1
Original line number Diff line number Diff line
@@ -323,6 +323,9 @@ int cnss_set_pcie_gen_speed(struct device *dev, u8 pcie_gen_speed) 
{

	struct cnss_plat_data *plat_priv = cnss_bus_dev_to_plat_priv(dev);



	if (!plat_priv)

		return -EINVAL;



	if (plat_priv->device_id != QCA6490_DEVICE_ID ||

	    !plat_priv->fw_pcie_gen_switch)

		return -ENOTSUPP;
@@ -2245,7 +2248,7 @@ int cnss_minidump_remove_region(struct cnss_plat_data *plat_priv, 
static int cnss_register_bus_scale(struct cnss_plat_data *plat_priv)

{

	int ret = -EINVAL;

	u32 idx, i, j, cfg_arr_size, *cfg_arr;

	u32 idx, i, j, cfg_arr_size, *cfg_arr = NULL;

	struct cnss_bus_bw_info *bus_bw_info, *tmp;

	struct device *dev = &plat_priv->plat_dev->dev;

drivers/net/wireless/cnss2/qmi.c

+1 −1
Original line number Diff line number Diff line
@@ -1300,7 +1300,7 @@ int cnss_wlfw_ini_send_sync(struct cnss_plat_data *plat_priv, 
int cnss_wlfw_send_pcie_gen_speed_sync(struct cnss_plat_data *plat_priv)

{

	struct wlfw_pcie_gen_switch_req_msg_v01 req;

	struct wlfw_pcie_gen_switch_resp_msg_v01 resp;

	struct wlfw_pcie_gen_switch_resp_msg_v01 resp = {0};

	struct qmi_txn txn;

	int ret = 0;