Skip to content

Commit

Permalink
agp/intel: put back check that we have a driver for the bridge.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dave Airlie committed Apr 20, 2010
1 parent d4b74bf commit 10fd883
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions drivers/char/agp/intel-agp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 10fd883

Please sign in to comment.