Commit 76dd7c74 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'icc-7.0-rc6' of... 

Merge tag 'icc-7.0-rc6' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/djakov/icc

 into char-misc-linus

interconnect fix for v7.0-rc

This contains one driver fix for the current cycle.

- interconnect: qcom: sm8450: Fix NULL pointer dereference in icc_link_nodes()

Signed-off-by: default avatarGeorgi Djakov <djakov@kernel.org>

* tag 'icc-7.0-rc6' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/djakov/icc:
  interconnect: qcom: sm8450: Fix NULL pointer dereference in icc_link_nodes()
parents f338e773 dbbd550d

drivers/interconnect/qcom/sm8450.c

+2 −2
Original line number Diff line number Diff line
@@ -800,7 +800,7 @@ static struct qcom_icc_node qhs_compute_cfg = { 
	.channels = 1,

	.buswidth = 4,

	.num_links = 1,

	.link_nodes = { MASTER_CDSP_NOC_CFG },

	.link_nodes = { &qhm_nsp_noc_config },

};



static struct qcom_icc_node qhs_cpr_cx = {
@@ -874,7 +874,7 @@ static struct qcom_icc_node qhs_lpass_cfg = { 
	.channels = 1,

	.buswidth = 4,

	.num_links = 1,

	.link_nodes = { MASTER_CNOC_LPASS_AG_NOC },

	.link_nodes = { &qhm_config_noc },

};



static struct qcom_icc_node qhs_mss_cfg = {