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 650/800] misc/pvpanic-pci: Fix error handling in pvpanic_pci_probe()
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit 372dae89972594393b57f29ec44e351fa7eedbbe ]

    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: db3a4f0abefd ("misc/pvpanic: add PCI driver")
    Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Link: https://lore.kernel.org/r/ab071b1f4ed6e1174f9199095fb16a58bb406090.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-pci.c | 9 +++------
    1 file changed, 3 insertions(+), 6 deletions(-)

    diff --git a/drivers/misc/pvpanic/pvpanic-pci.c b/drivers/misc/pvpanic/pvpanic-pci.c
    index 9ecc4e8559d5..046ce4ecc195 100644
    --- a/drivers/misc/pvpanic/pvpanic-pci.c
    +++ b/drivers/misc/pvpanic/pvpanic-pci.c
    @@ -78,15 +78,15 @@ static int pvpanic_pci_probe(struct pci_dev *pdev,
    void __iomem *base;
    int ret;

    - ret = pci_enable_device(pdev);
    + ret = pcim_enable_device(pdev);
    if (ret < 0)
    return ret;

    - base = pci_iomap(pdev, 0, 0);
    + base = pcim_iomap(pdev, 0, 0);
    if (!base)
    return -ENOMEM;

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

    @@ -107,9 +107,6 @@ static void pvpanic_pci_remove(struct pci_dev *pdev)
    struct pvpanic_instance *pi = dev_get_drvdata(&pdev->dev);

    pvpanic_remove(pi);
    - iounmap(pi->base);
    - kfree(pi);
    - pci_disable_device(pdev);
    }

    static struct pci_driver pvpanic_pci_driver = {
    --
    2.30.2


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