TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

slimbus: ngd: Fix build error on x86

Browse Source 
[ Upstream commit 458a445deb9c9fb13cec46fe9b179a84d2ff514f ]

on non DT platforms like x86 of_match_node is set to NULL, dereferencing
directly would throw an error.
Fix this by doing this in two steps, get the match then the data.

Reported-by: Greg KH <gregkh@linuxfoundation.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Srinivas Kandagatla
2018-11-12 12:25:25 +00:00
committed by Greg Kroah-Hartman
parent 0c40b942f6
commit d7e82b903d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/slimbus/qcom-ngd-ctrl.c
View File

@@ -1326,11 +1326,12 @@ static int of_qcom_slim_ngd_register(struct device *parent,
{ {
const struct ngd_reg_offset_data *data; const struct ngd_reg_offset_data *data;
struct qcom_slim_ngd *ngd; struct qcom_slim_ngd *ngd;
const struct of_device_id *match;
struct device_node *node; struct device_node *node;
u32 id; u32 id;
data = of_match_node(qcom_slim_ngd_dt_match, parent->of_node)->data; match = of_match_node(qcom_slim_ngd_dt_match, parent->of_node);
data = match->data;
for_each_available_child_of_node(parent->of_node, node) { for_each_available_child_of_node(parent->of_node, node) {
if (of_property_read_u32(node, "reg", &id)) if (of_property_read_u32(node, "reg", &id))
continue; continue;