From 2fb83f08d8a81f3951821c0888b7cf2a4d81b702 Mon Sep 17 00:00:00 2001 From: Jiang Liu Date: Mon, 21 Jan 2013 13:20:45 -0800 Subject: [PATCH] --- yaml --- r: 358411 b: refs/heads/master c: d5af7d987a494a1b85e176b4c33dc115cb111662 h: refs/heads/master i: 358409: 8e52d47c437610c5a4730ab23d83bfd799c9e928 358407: 3cdc9fbdbf97d6361dd5ba5034c394c591458119 v: v3 --- [refs] | 2 +- trunk/drivers/pci/search.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 0e7718719c75..939a8f1906d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7629d19a4df922e7497e170c1c7b508b5e27f486 +refs/heads/master: d5af7d987a494a1b85e176b4c33dc115cb111662 diff --git a/trunk/drivers/pci/search.c b/trunk/drivers/pci/search.c index bf969ba58e59..d0627fa9f368 100644 --- a/trunk/drivers/pci/search.c +++ b/trunk/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);