OSDN Git Service

misc/pvpanic-mmio: Fix error handling in 'pvpanic_mmio_probe()'
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Sat, 22 May 2021 06:55:03 +0000 (08:55 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 27 May 2021 12:46:57 +0000 (14:46 +0200)
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>
drivers/misc/pvpanic/pvpanic-mmio.c

index 4c08417..69b31f7 100644 (file)
@@ -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;
 }