| Message ID | 1357944049-29620-5-git-send-email-yinghai@kernel.org |
|---|---|
| State | Superseded |
| Headers | show |
On Friday, January 11, 2013 02:40:31 PM Yinghai Lu wrote: > From: Jiang Liu <jiang.liu@huawei.com> > > Function pci_get_dev_by_id() will hold a reference count on the pci device > returned, so pci_dev_present() should release the corresponding reference > count to avoid memory leakage. > > Signed-off-by: Jiang Liu <jiang.liu@huawei.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > drivers/pci/search.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/pci/search.c b/drivers/pci/search.c > index bf969ba..d0627fa 100644 > --- a/drivers/pci/search.c > +++ b/drivers/pci/search.c > @@ -319,13 +319,13 @@ int pci_dev_present(const struct pci_device_id *ids) > WARN_ON(in_interrupt()); > while (ids->vendor || ids->subvendor || ids->class_mask) { > found = pci_get_dev_by_id(ids, NULL); > - if (found) > - goto exit; > + if (found) { > + pci_dev_put(found); > + return 1; > + } > ids++; > } > -exit: > - if (found) > - return 1; > + > return 0; > } > EXPORT_SYMBOL(pci_dev_present); >
diff --git a/drivers/pci/search.c b/drivers/pci/search.c index bf969ba..d0627fa 100644 --- a/drivers/pci/search.c +++ b/drivers/pci/search.c @@ -319,13 +319,13 @@ int pci_dev_present(const struct pci_device_id *ids) WARN_ON(in_interrupt()); while (ids->vendor || ids->subvendor || ids->class_mask) { found = pci_get_dev_by_id(ids, NULL); - if (found) - goto exit; + if (found) { + pci_dev_put(found); + return 1; + } ids++; } -exit: - if (found) - return 1; + return 0; } EXPORT_SYMBOL(pci_dev_present);