summaryrefslogtreecommitdiff
path: root/drivers/misc/pvpanic
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2021-05-22 08:55:03 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-27 14:46:57 +0200
commit9a3c72ee6ffcd461bae1bbdf4e71dca6d5bc160c (patch)
treee58aeef27964d11be227e264e235766e01a61060 /drivers/misc/pvpanic
parentb647ceb5a13e0cbe2f47fcc939a87526e1debf10 (diff)
misc/pvpanic-mmio: Fix error handling in 'pvpanic_mmio_probe()'
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>
Diffstat (limited to 'drivers/misc/pvpanic')
-rw-r--r--drivers/misc/pvpanic/pvpanic-mmio.c3
1 files changed, 1 insertions, 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;
}