瀏覽代碼

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>
Dave Airlie 15 年之前
父節點
當前提交
10fd883ce3
共有 1 個文件被更改,包括 8 次插入0 次删除
  1. 8 0
      drivers/char/agp/intel-agp.c

+ 8 - 0
drivers/char/agp/intel-agp.c

@@ -885,6 +885,14 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,
 		return -ENODEV;
 		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 = pdev;
 	bridge->dev_private_data = NULL;
 	bridge->dev_private_data = NULL;