lkml.org 
[lkml]   [2020]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.7 310/388] mailbox: imx: Fix return in imx_mu_scu_xlate()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit 1b3a347b7d56aa637157da1b7df225071af1421f ]

    This called from mbox_request_channel(). The caller is expecting error
    pointers and not NULL so this "return NULL;" will lead to an Oops.

    Fixes: 0a67003b1985 ("mailbox: imx: add SCU MU support")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/mailbox/imx-mailbox.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/mailbox/imx-mailbox.c b/drivers/mailbox/imx-mailbox.c
    index 7906624a731c..9d6f0217077b 100644
    --- a/drivers/mailbox/imx-mailbox.c
    +++ b/drivers/mailbox/imx-mailbox.c
    @@ -374,7 +374,7 @@ static struct mbox_chan *imx_mu_scu_xlate(struct mbox_controller *mbox,
    break;
    default:
    dev_err(mbox->dev, "Invalid chan type: %d\n", type);
    - return NULL;
    + return ERR_PTR(-EINVAL);
    }

    if (chan >= mbox->num_chans) {
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-18 03:18    [W:5.174 / U:0.360 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site