lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 651/800] misc/pvpanic-mmio: Fix error handling in pvpanic_mmio_probe()
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit 9a3c72ee6ffcd461bae1bbdf4e71dca6d5bc160c ]

    There is no error handling path in the probe function.
    Switch to managed resource so that errors in the probe are handled easily
    and simplify the remove function accordingly.

    Fixes: b3c0f8774668 ("misc/pvpanic: probe multiple instances")
    Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Link: https://lore.kernel.org/r/2a5dab18f10db783b27e0579ba66cc38d610734a.1621665058.git.christophe.jaillet@wanadoo.fr
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/misc/pvpanic/pvpanic-mmio.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    diff --git a/drivers/misc/pvpanic/pvpanic-mmio.c b/drivers/misc/pvpanic/pvpanic-mmio.c
    index 4c0841776087..69b31f7adf4f 100644
    --- a/drivers/misc/pvpanic/pvpanic-mmio.c
    +++ b/drivers/misc/pvpanic/pvpanic-mmio.c
    @@ -93,7 +93,7 @@ static int pvpanic_mmio_probe(struct platform_device *pdev)
    return -EINVAL;
    }

    - pi = kmalloc(sizeof(*pi), GFP_ATOMIC);
    + pi = devm_kmalloc(dev, sizeof(*pi), GFP_ATOMIC);
    if (!pi)
    return -ENOMEM;

    @@ -114,7 +114,6 @@ static int pvpanic_mmio_remove(struct platform_device *pdev)
    struct pvpanic_instance *pi = dev_get_drvdata(&pdev->dev);

    pvpanic_remove(pi);
    - kfree(pi);

    return 0;
    }
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 11:09    [W:4.055 / U:1.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site