Commit:     b95d58eaf20eb33c245a2172ec4ecf46bd832309
Parent:     9f24e82d07e2c64467d0c0c04a798de56461fd4a
Author:     Tejun Heo <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 30 18:20:04 2008 +0900
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Fri Feb 1 12:26:44 2008 -0500

    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
    This allows more flexibility to managed PCI users.
    Signed-off-by: Tejun Heo <[EMAIL PROTECTED]>
    Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
 drivers/pci/pci.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 71d561f..7d4ce90 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -823,7 +823,8 @@ int pcim_enable_device(struct pci_dev *pdev)
        dr = get_pci_dr(pdev);
        if (unlikely(!dr))
                return -ENOMEM;
-       WARN_ON(!!dr->enabled);
+       if (dr->enabled)
+               return 0;
        rc = pci_enable_device(pdev);
        if (!rc) {
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to