summaryrefslogtreecommitdiffstats
path: root/drivers/slimbus
diff options
context:
space:
mode:
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>2018-11-12 12:25:25 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-11-27 08:44:06 +0100
commit458a445deb9c9fb13cec46fe9b179a84d2ff514f (patch)
treedb3d8ea8586a9395d15b95c0a71f7a6dd1ad6dd0 /drivers/slimbus
parentaa1f0fa374ed23528b915a693a11b0f275a299c0 (diff)
downloadlinux-458a445deb9c9fb13cec46fe9b179a84d2ff514f.tar.gz
linux-458a445deb9c9fb13cec46fe9b179a84d2ff514f.tar.bz2
linux-458a445deb9c9fb13cec46fe9b179a84d2ff514f.zip
slimbus: ngd: Fix build error on x86
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>
Diffstat (limited to 'drivers/slimbus')
-rw-r--r--drivers/slimbus/qcom-ngd-ctrl.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c
index 1382a8df6c75..ccf33217236c 100644
--- a/drivers/slimbus/qcom-ngd-ctrl.c
+++ b/drivers/slimbus/qcom-ngd-ctrl.c
@@ -1327,11 +1327,12 @@ static int of_qcom_slim_ngd_register(struct device *parent,
{
const struct ngd_reg_offset_data *data;
struct qcom_slim_ngd *ngd;
+ const struct of_device_id *match;
struct device_node *node;
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) {
if (of_property_read_u32(node, "reg", &id))
continue;