Commit 1563fca2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'soundwire-5.17-rc1' of... 

Merge tag 'soundwire-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire into char-misc-next

Vinod writes:

soundwire updates for 5.17-rc1

 - Remove redundant version number read in qcom driver

* tag 'soundwire-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire:
  soundwire: qcom: remove redundant version number read
parents 0fa32879 bb349fd2

drivers/soundwire/qcom.c

+1 −5
Original line number Diff line number Diff line
@@ -1156,11 +1156,7 @@ static int qcom_swrm_get_port_config(struct qcom_swrm_ctrl *ctrl) 
	ret = of_property_read_u8_array(np, "qcom,ports-block-pack-mode",

					bp_mode, nports);

	if (ret) {

		u32 version;



		ctrl->reg_read(ctrl, SWRM_COMP_HW_VERSION, &version);



		if (version <= 0x01030000)

		if (ctrl->version <= 0x01030000)

			memset(bp_mode, SWR_INVALID_PARAM, QCOM_SDW_MAX_PORTS);

		else

			return ret;