lkml.org 
[lkml]   [2018]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.16 148/272] remoteproc: imx_rproc: Fix an error handling path in imx_rproc_probe()
    Date
    4.16-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit de6f83f85be94e0b7d0d324c29ccc9d78a6bb4e7 ]

    If 'of_device_get_match_data()' fails, we must undo the previous
    'rproc_alloc()' call.

    Fixes: a0ff4aa6f010 ("remoteproc: imx_rproc: add a NXP/Freescale imx_rproc driver")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/remoteproc/imx_rproc.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    --- a/drivers/remoteproc/imx_rproc.c
    +++ b/drivers/remoteproc/imx_rproc.c
    @@ -339,8 +339,10 @@ static int imx_rproc_probe(struct platfo
    }

    dcfg = of_device_get_match_data(dev);
    - if (!dcfg)
    - return -EINVAL;
    + if (!dcfg) {
    + ret = -EINVAL;
    + goto err_put_rproc;
    + }

    priv = rproc->priv;
    priv->rproc = rproc;

    \
     
     \ /
      Last update: 2018-05-28 13:48    [W:2.866 / U:0.200 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site