lkml.org 
[lkml]   [2022]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 0386/1126] memory: emif: Add check for setup_interrupts
    Date
    From: Jiasheng Jiang <jiasheng@iscas.ac.cn>

    [ Upstream commit fd7bd80b46373887b390852f490f21b07e209498 ]

    As the potential failure of the devm_request_threaded_irq(),
    it should be better to check the return value of the
    setup_interrupts() and return error if fails.

    Fixes: 68b4aee35d1f ("memory: emif: add interrupt and temperature handling")
    Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
    Link: https://lore.kernel.org/r/20220224025444.3256530-1-jiasheng@iscas.ac.cn
    Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/memory/emif.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/memory/emif.c b/drivers/memory/emif.c
    index 762d0c0f0716..d4d4044e05b3 100644
    --- a/drivers/memory/emif.c
    +++ b/drivers/memory/emif.c
    @@ -1117,7 +1117,7 @@ static int __init_or_module emif_probe(struct platform_device *pdev)
    {
    struct emif_data *emif;
    struct resource *res;
    - int irq;
    + int irq, ret;

    if (pdev->dev.of_node)
    emif = of_get_memory_device_details(pdev->dev.of_node, &pdev->dev);
    @@ -1147,7 +1147,9 @@ static int __init_or_module emif_probe(struct platform_device *pdev)
    emif_onetime_settings(emif);
    emif_debugfs_init(emif);
    disable_and_clear_all_interrupts(emif);
    - setup_interrupts(emif, irq);
    + ret = setup_interrupts(emif, irq);
    + if (ret)
    + goto error;

    /* One-time actions taken on probing the first device */
    if (!emif1) {
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-05 10:25    [W:4.017 / U:2.228 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site