interconnect: imx: fix max_node_id
authorPeng Fan <peng.fan@nxp.com>
Sun, 3 Jul 2022 09:11:26 +0000 (17:11 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Aug 2022 12:23:53 +0000 (14:23 +0200)
[ Upstream commit bd734481e172b4827af09c9ab06c51d2ab7201e6 ]

max_node_id not equal to the ARRAY_SIZE of node array, need increase 1,
otherwise xlate will fail for the last entry. And rename max_node_id
to num_nodes to reflect the reality.

Fixes: f0d8048525d7d ("interconnect: Add imx core driver")
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Link: https://lore.kernel.org/r/20220703091132.1412063-5-peng.fan@oss.nxp.com
Signed-off-by: Georgi Djakov <djakov@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/interconnect/imx/imx.c

index c770951..aabd9ed 100644 (file)
@@ -226,16 +226,16 @@ int imx_icc_register(struct platform_device *pdev,
        struct device *dev = &pdev->dev;
        struct icc_onecell_data *data;
        struct icc_provider *provider;
-       int max_node_id;
+       int num_nodes;
        int ret;
 
        /* icc_onecell_data is indexed by node_id, unlike nodes param */
-       max_node_id = get_max_node_id(nodes, nodes_count);
-       data = devm_kzalloc(dev, struct_size(data, nodes, max_node_id),
+       num_nodes = get_max_node_id(nodes, nodes_count) + 1;
+       data = devm_kzalloc(dev, struct_size(data, nodes, num_nodes),
                            GFP_KERNEL);
        if (!data)
                return -ENOMEM;
-       data->num_nodes = max_node_id;
+       data->num_nodes = num_nodes;
 
        provider = devm_kzalloc(dev, sizeof(*provider), GFP_KERNEL);
        if (!provider)