lkml.org 
[lkml]   [2020]   [Apr]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 20/57] remoteproc: qcom_q6v5_mss: fix a bug in q6v5_probe()
    Date
    From: Alex Elder <elder@linaro.org>

    [ Upstream commit 13c060b50a341dd60303e5264d12108b5747f200 ]

    If looking up the DT "firmware-name" property fails in q6v6_probe(),
    the function returns without freeing the remoteproc structure
    that has been allocated. Fix this by jumping to the free_rproc
    label, which takes care of this.

    Signed-off-by: Alex Elder <elder@linaro.org>
    Link: https://lore.kernel.org/r/20200403175005.17130-3-elder@linaro.org
    Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/remoteproc/qcom_q6v5_mss.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c
    index 783d00131a2a9..6ba065d5c4d95 100644
    --- a/drivers/remoteproc/qcom_q6v5_mss.c
    +++ b/drivers/remoteproc/qcom_q6v5_mss.c
    @@ -1440,7 +1440,7 @@ static int q6v5_probe(struct platform_device *pdev)
    ret = of_property_read_string_index(pdev->dev.of_node, "firmware-name",
    1, &qproc->hexagon_mdt_image);
    if (ret < 0 && ret != -EINVAL)
    - return ret;
    + goto free_rproc;

    platform_set_drvdata(pdev, qproc);

    --
    2.20.1
    \
     
     \ /
      Last update: 2020-04-30 16:08    [W:5.787 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site