From: Daniel Vetter Date: Thu, 7 Jun 2012 13:55:58 +0000 (+0200) Subject: agp/intel-gtt: don't require the agp bridge on setup X-Git-Tag: v3.6-rc1~83^2~42^2~51 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7e8f6306fe155d6fc3fe99d666be95b4ed24427d;p=platform%2Fkernel%2Flinux-exynos.git agp/intel-gtt: don't require the agp bridge on setup We only need it to fake the agp interface and don't actually use it in the driver anywhere. Hence conditionalize that. This is just a prep patch to eventually disable the fake agp driver on gen6+. Reviewed-by: Jani Nikula Signed-off-by: Daniel Vetter --- diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index 2aab0a0..5e6c89e 100644 --- a/drivers/char/agp/intel-gtt.c +++ b/drivers/char/agp/intel-gtt.c @@ -1539,9 +1539,11 @@ int intel_gmch_probe(struct pci_dev *pdev, if (!intel_private.driver) return 0; - bridge->driver = &intel_fake_agp_driver; - bridge->dev_private_data = &intel_private; - bridge->dev = pdev; + if (bridge) { + bridge->driver = &intel_fake_agp_driver; + bridge->dev_private_data = &intel_private; + bridge->dev = pdev; + } intel_private.bridge_dev = pci_dev_get(pdev);