lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 0762/1095] interconnect: imx: fix max_node_id
    Date
    From: Peng Fan <peng.fan@nxp.com>

    [ 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 | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/interconnect/imx/imx.c b/drivers/interconnect/imx/imx.c
    index 249ca25d1d55..4406ec45fa90 100644
    --- a/drivers/interconnect/imx/imx.c
    +++ b/drivers/interconnect/imx/imx.c
    @@ -234,16 +234,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)
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-16 00:29    [W:2.763 / U:1.868 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site