diff options
author | Dave Airlie <airlied@redhat.com> | 2010-04-20 02:34:20 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-04-20 02:38:18 -0400 |
commit | 10fd883ce384706f88554a0b08cc4d63345e7d8b (patch) | |
tree | cdd1b5415a8a1ad471da8ff83139b96326711f54 /drivers | |
parent | d4b74bf07873da2e94219a7b67a334fc1c3ce649 (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/agp/intel-agp.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c index 07a9aad28c11..034644eeedf2 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, | |||
885 | return -ENODEV; | 885 | return -ENODEV; |
886 | } | 886 | } |
887 | 887 | ||
888 | if (!bridge->driver) { | ||
889 | if (cap_ptr) | ||
890 | dev_warn(&pdev->dev, "can't find bridge device (chip_id: %04x)\n", | ||
891 | intel_agp_chipsets[i].gmch_chip_id); | ||
892 | agp_put_bridge(bridge); | ||
893 | return -ENODEV; | ||
894 | } | ||
895 | |||
888 | bridge->dev = pdev; | 896 | bridge->dev = pdev; |
889 | bridge->dev_private_data = NULL; | 897 | bridge->dev_private_data = NULL; |
890 | 898 | ||