Commit 372dae89 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman
Browse files

misc/pvpanic-pci: Fix error handling in 'pvpanic_pci_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: db3a4f0a ("misc/pvpanic: add PCI driver")
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/ab071b1f4ed6e1174f9199095fb16a58bb406090.1621665058.git.christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ee9b9b81

drivers/misc/pvpanic/pvpanic-pci.c

+3 −6
Original line number Diff line number Diff line
@@ -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 = {