From b214ec3d78e58d0dab3f0157f6015865ed98dc4d Mon Sep 17 00:00:00 2001
From: Konstantin Khlebnikov <khlebnikov@openvz.org>
Date: Mon, 4 Feb 2013 15:56:01 +0400
Subject: [PATCH] --- yaml --- r: 358435 b: refs/heads/master c:
 fd6dceab017e6be6c158dc56ec6dacf817f21a5b h: refs/heads/master i:   358433:
 0f428d4c31f91d26486a0f3bbd984506f678c21c   358431:
 2e1ae716837d4ffd4caaf93327a9e8b5a995c410 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/pci/pci.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fd7105915a18..3ca49d7c5376 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7897e6022761ace7377f0f784fca059da55f5d71
+refs/heads/master: fd6dceab017e6be6c158dc56ec6dacf817f21a5b
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
index 5cb5820fae40..29a09b705f04 100644
--- a/trunk/drivers/pci/pci.c
+++ b/trunk/drivers/pci/pci.c
@@ -1401,6 +1401,9 @@ pci_disable_device(struct pci_dev *dev)
 	if (dr)
 		dr->enabled = 0;
 
+	dev_WARN_ONCE(&dev->dev, atomic_read(&dev->enable_cnt) <= 0,
+		      "disabling already-disabled device");
+
 	if (atomic_sub_return(1, &dev->enable_cnt) != 0)
 		return;