---

yaml --- r: 318574 b: refs/heads/master c: 7e8f630 h: refs/heads/master v: v3
git-mirror · Jun 12, 2012 · ab42b27 · ab42b27
1 parent ea396cf
commit ab42b27
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd2757f8b557ab2030154896eac9b2285557dda6
+refs/heads/master: 7e8f6306fe155d6fc3fe99d666be95b4ed24427d
diff --git a/trunk/drivers/char/agp/intel-gtt.c b/trunk/drivers/char/agp/intel-gtt.c
@@ -1539,9 +1539,11 @@ int intel_gmch_probe(struct pci_dev *pdev,
 	if (!intel_private.driver)
 		return 0;
 
-	bridge->driver = &intel_fake_agp_driver;
-	bridge->dev_private_data = &intel_private;
-	bridge->dev = pdev;
+	if (bridge) {
+		bridge->driver = &intel_fake_agp_driver;
+		bridge->dev_private_data = &intel_private;
+		bridge->dev = pdev;
+	}
 
 	intel_private.bridge_dev = pci_dev_get(pdev);