projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v4.4/topic/mm-kaslr-pax_usercopy' into linux-linaro-lsk-v4.4
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
pci
/
search.c
diff --git
a/drivers/pci/search.c
b/drivers/pci/search.c
index a81f413083e49e5751013bf4f0602a2605286dc2..a20ce7d5e2a718551554a1e860457b852756d97b 100644
(file)
--- a/
drivers/pci/search.c
+++ b/
drivers/pci/search.c
@@
-271,8
+271,7
@@
static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id,
match_pci_dev_by_id);
if (dev)
pdev = to_pci_dev(dev);
match_pci_dev_by_id);
if (dev)
pdev = to_pci_dev(dev);
- if (from)
- pci_dev_put(from);
+ pci_dev_put(from);
return pdev;
}
return pdev;
}