diff --git a/[refs] b/[refs]
index 6c929870829d..8a2aef3ac204 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f24e82d07e2c64467d0c0c04a798de56461fd4a
+refs/heads/master: b95d58eaf20eb33c245a2172ec4ecf46bd832309
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
index 71d561fda0a2..7d4ce906d207 100644
--- a/trunk/drivers/pci/pci.c
+++ b/trunk/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) {