diff options
Diffstat (limited to 'drivers/pci/search.c')
| -rw-r--r-- | drivers/pci/search.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/pci/search.c b/drivers/pci/search.c index 217814fef4ef..4edfc4731bd4 100644 --- a/drivers/pci/search.c +++ b/drivers/pci/search.c | |||
| @@ -162,7 +162,7 @@ EXPORT_SYMBOL(pci_find_slot); | |||
| 162 | * time. | 162 | * time. |
| 163 | */ | 163 | */ |
| 164 | struct pci_dev *pci_find_device(unsigned int vendor, unsigned int device, | 164 | struct pci_dev *pci_find_device(unsigned int vendor, unsigned int device, |
| 165 | const struct pci_dev *from) | 165 | struct pci_dev *from) |
| 166 | { | 166 | { |
| 167 | struct pci_dev *pdev; | 167 | struct pci_dev *pdev; |
| 168 | 168 | ||
| @@ -263,7 +263,7 @@ static int match_pci_dev_by_id(struct device *dev, void *data) | |||
| 263 | * this file. | 263 | * this file. |
| 264 | */ | 264 | */ |
| 265 | static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id, | 265 | static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id, |
| 266 | const struct pci_dev *from) | 266 | struct pci_dev *from) |
| 267 | { | 267 | { |
| 268 | struct device *dev; | 268 | struct device *dev; |
| 269 | struct device *dev_start = NULL; | 269 | struct device *dev_start = NULL; |
| @@ -280,6 +280,8 @@ static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id, | |||
| 280 | match_pci_dev_by_id); | 280 | match_pci_dev_by_id); |
| 281 | if (dev) | 281 | if (dev) |
| 282 | pdev = to_pci_dev(dev); | 282 | pdev = to_pci_dev(dev); |
| 283 | if (from) | ||
| 284 | pci_dev_put(from); | ||
| 283 | return pdev; | 285 | return pdev; |
| 284 | } | 286 | } |
| 285 | 287 | ||
| @@ -301,7 +303,7 @@ static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id, | |||
| 301 | */ | 303 | */ |
| 302 | struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device, | 304 | struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device, |
| 303 | unsigned int ss_vendor, unsigned int ss_device, | 305 | unsigned int ss_vendor, unsigned int ss_device, |
| 304 | const struct pci_dev *from) | 306 | struct pci_dev *from) |
| 305 | { | 307 | { |
| 306 | struct pci_dev *pdev; | 308 | struct pci_dev *pdev; |
| 307 | struct pci_device_id *id; | 309 | struct pci_device_id *id; |
