OSDN Git Service

Revert "staging: gasket: core: hold reference to pci_dev while used"
authorTodd Poynor <toddpoynor@google.com>
Fri, 3 Aug 2018 01:49:52 +0000 (18:49 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 5 Aug 2018 14:12:53 +0000 (16:12 +0200)
There's no need to take an additional reference on the pci_dev structure
for the pointer copy saved in gasket data structures.

This reverts commit:
8dd8a48b9a7d ("staging: gasket: core: hold reference to pci_dev while used")

Reported-by: Dmitry Torokhov <dtor@chromium.org>
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/gasket/gasket_core.c

index 93a4d9f..2d209e3 100644 (file)
@@ -255,7 +255,6 @@ static void gasket_free_dev(struct gasket_dev *gasket_dev)
        internal_desc->devs[gasket_dev->dev_idx] = NULL;
        mutex_unlock(&internal_desc->mutex);
        put_device(gasket_dev->dev);
-       pci_dev_put(gasket_dev->pci_dev);
        kfree(gasket_dev);
 }
 
@@ -1477,7 +1476,7 @@ static int gasket_pci_probe(struct pci_dev *pci_dev,
        ret = gasket_alloc_dev(internal_desc, parent, &gasket_dev, kobj_name);
        if (ret)
                return ret;
-       gasket_dev->pci_dev = pci_dev_get(pci_dev);
+       gasket_dev->pci_dev = pci_dev;
        if (IS_ERR_OR_NULL(gasket_dev->dev_info.device)) {
                pr_err("Cannot create %s device %s [ret = %ld]\n",
                       driver_desc->name, gasket_dev->dev_info.name,