From 10fd883ce384706f88554a0b08cc4d63345e7d8b Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 20 Apr 2010 16:34:20 +1000
Subject: [PATCH] agp/intel: put back check that we have a driver for the
bridge.
On my 945 laptop + radeon GPU, I was getting an oops on boot without this
check which seems to have gotten dropped in the rework.
Signed-off-by: Dave Airlie <airlied@redhat.com>
---
drivers/char/agp/intel-agp.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 07a9aad28c116..034644eeedf25 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/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;
--
GitLab