projects
/
profile
/
common
/
kernel-common.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d4b74bf
)
agp/intel: put back check that we have a driver for the bridge.
author
Dave Airlie
<airlied@redhat.com>
Tue, 20 Apr 2010 06:34:20 +0000
(16:34 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Tue, 20 Apr 2010 06:38:18 +0000
(16:38 +1000)
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
patch
|
blob
|
history
diff --git
a/drivers/char/agp/intel-agp.c
b/drivers/char/agp/intel-agp.c
index
07a9aad
..
034644e
100644
(file)
--- 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;