[src/netbsd-7]: src/sys/external/bsd/drm2/dist/drm/i915 Pull up following rev...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/53bf4c2a5c44
branches:  netbsd-7
changeset: 798635:53bf4c2a5c44
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Nov 28 10:01:27 2014 +0000

description:
Pull up following revision(s) (requested by nonaka in ticket #271):
        sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c: revision 1.8
Avoid NULL pointer dereference when acpivga isn't attached.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (14 lines):

diff -r a9a3d4627118 -r 53bf4c2a5c44 sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c      Fri Nov 28 09:09:19 2014 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c      Fri Nov 28 10:01:27 2014 +0000
@@ -674,7 +674,9 @@
 
 #ifdef __NetBSD__
        ad = dev->pdev->pd_ad;
-       if (ad == NULL || !device_is_a(ad->ad_device, "acpivga"))
+       if (ad == NULL ||
+           ad->ad_device == NULL ||
+           !device_is_a(ad->ad_device, "acpivga"))
                return;
 #else
        handle = ACPI_HANDLE(&dev->pdev->dev);