Commit e729e0fd authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Vinod Koul
Browse files

soundwire: qcom: handle return correctly in qcom_swrm_transport_params 



Looks like return from reg_write is set but not checked.
Fix this by adding error return path.

Reported-by: default avatarcoverity-bot <keescook+coverity-bot@chromium.org>
Addresses-Coverity-ID: 1503591 ("UNUSED_VALUE")
Fixes: 128eaf93 ("soundwire: qcom: add support to missing transport params")
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20210401091502.15825-1-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 9916c02c

drivers/soundwire/qcom.c

+10 −0
Original line number Diff line number Diff line
@@ -731,17 +731,23 @@ static int qcom_swrm_transport_params(struct sdw_bus *bus, 
	value |= pcfg->si;



	ret = ctrl->reg_write(ctrl, reg, value);

	if (ret)

		goto err;



	if (pcfg->lane_control != SWR_INVALID_PARAM) {

		reg = SWRM_DP_PORT_CTRL_2_BANK(params->port_num, bank);

		value = pcfg->lane_control;

		ret = ctrl->reg_write(ctrl, reg, value);

		if (ret)

			goto err;

	}



	if (pcfg->blk_group_count != SWR_INVALID_PARAM) {

		reg = SWRM_DP_BLOCK_CTRL2_BANK(params->port_num, bank);

		value = pcfg->blk_group_count;

		ret = ctrl->reg_write(ctrl, reg, value);

		if (ret)

			goto err;

	}



	if (pcfg->hstart != SWR_INVALID_PARAM
@@ -755,11 +761,15 @@ static int qcom_swrm_transport_params(struct sdw_bus *bus, 
		ret = ctrl->reg_write(ctrl, reg, value);

	}



	if (ret)

		goto err;



	if (pcfg->bp_mode != SWR_INVALID_PARAM) {

		reg = SWRM_DP_BLOCK_CTRL3_BANK(params->port_num, bank);

		ret = ctrl->reg_write(ctrl, reg, pcfg->bp_mode);

	}



err:

	return ret;

}