From 7308a4e50a81c3457413cfae85347f766cc32d5a Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 20 Apr 2010 16:34:20 +1000
Subject: [PATCH] --- yaml --- r: 196478 b: refs/heads/master c:
 10fd883ce384706f88554a0b08cc4d63345e7d8b h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/char/agp/intel-agp.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c833e4a25d7e..3b65b4e96c29 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4b74bf07873da2e94219a7b67a334fc1c3ce649
+refs/heads/master: 10fd883ce384706f88554a0b08cc4d63345e7d8b
diff --git a/trunk/drivers/char/agp/intel-agp.c b/trunk/drivers/char/agp/intel-agp.c
index 07a9aad28c11..034644eeedf2 100644
--- a/trunk/drivers/char/agp/intel-agp.c
+++ b/trunk/drivers/char/agp/intel-agp.c
@@ -885,6 +885,14 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,
 		return -ENODEV;
 	}
 
+	if (!bridge->driver) {
+		if (cap_ptr)
+			dev_warn(&pdev->dev, "can't find bridge device (chip_id: %04x)\n",
+			    	 intel_agp_chipsets[i].gmch_chip_id);
+		agp_put_bridge(bridge);
+		return -ENODEV;
+	}
+
 	bridge->dev = pdev;
 	bridge->dev_private_data = NULL;