Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8dd8a48b authored by Todd Poynor's avatar Todd Poynor Committed by Greg Kroah-Hartman
Browse files

staging: gasket: core: hold reference to pci_dev while used 



Hold a reference on the struct pci_dev while a pointer to it is held in
the gasket data structures.

Signed-off-by: default avatarTodd Poynor <toddpoynor@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c7346797

drivers/staging/gasket/gasket_core.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -488,6 +488,7 @@ static void gasket_free_dev(struct gasket_dev *gasket_dev) 
	internal_desc->devs[gasket_dev->dev_idx] = NULL;

	internal_desc->devs[gasket_dev->dev_idx] = NULL;

	mutex_unlock(&internal_desc->mutex);

	mutex_unlock(&internal_desc->mutex);

	put_device(gasket_dev->dev);

	put_device(gasket_dev->dev);

	pci_dev_put(gasket_dev->pci_dev);

	kfree(gasket_dev);

	kfree(gasket_dev);

}

}
@@ -565,6 +566,7 @@ static int gasket_pci_probe( 
	ret = gasket_alloc_dev(internal_desc, parent, &gasket_dev, kobj_name);

	ret = gasket_alloc_dev(internal_desc, parent, &gasket_dev, kobj_name);

	if (ret)

	if (ret)

		return ret;

		return ret;

	gasket_dev->pci_dev = pci_dev_get(pci_dev);

	if (IS_ERR_OR_NULL(gasket_dev->dev_info.device)) {

	if (IS_ERR_OR_NULL(gasket_dev->dev_info.device)) {

		pr_err("Cannot create %s device %s [ret = %ld]\n",

		pr_err("Cannot create %s device %s [ret = %ld]\n",

		       driver_desc->name, gasket_dev->dev_info.name,

		       driver_desc->name, gasket_dev->dev_info.name,
@@ -572,7 +574,6 @@ static int gasket_pci_probe( 
		ret = -ENODEV;

		ret = -ENODEV;

		goto fail1;

		goto fail1;

	}

	}

	gasket_dev->pci_dev = pci_dev;





	ret = gasket_setup_pci(pci_dev, gasket_dev);

	ret = gasket_setup_pci(pci_dev, gasket_dev);

	if (ret)

	if (ret)
@@ -703,7 +704,6 @@ static int gasket_setup_pci( 
{

{

	int i, mapped_bars, ret;

	int i, mapped_bars, ret;





	gasket_dev->pci_dev = pci_dev;

	ret = pci_enable_device(pci_dev);

	ret = pci_enable_device(pci_dev);

	if (ret) {

	if (ret) {

		dev_err(gasket_dev->dev, "cannot enable PCI device\n");

		dev_err(gasket_dev->dev, "cannot enable PCI device\n");