Commit b95d58ea authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik

pci: allow multiple calls to pcim_enable_device()

There's no reason not to allow multiple calls to pcim_enable_device().
Calls after the first one can simply be noop.  All PCI resources will
be released when the initial pcim_enable_device() resource is
released.

This allows more flexibility to managed PCI users.
Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 9f24e82d
...@@ -823,7 +823,8 @@ int pcim_enable_device(struct pci_dev *pdev) ...@@ -823,7 +823,8 @@ int pcim_enable_device(struct pci_dev *pdev)
dr = get_pci_dr(pdev); dr = get_pci_dr(pdev);
if (unlikely(!dr)) if (unlikely(!dr))
return -ENOMEM; return -ENOMEM;
WARN_ON(!!dr->enabled); if (dr->enabled)
return 0;
rc = pci_enable_device(pdev); rc = pci_enable_device(pdev);
if (!rc) { if (!rc) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment