[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 avoid NULL pointer deref...

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

details:   https://anonhg.NetBSD.org/src/rev/98d2d3944107
branches:  trunk
changeset: 333988:98d2d3944107
user:      nonaka <nonaka%NetBSD.org@localhost>
date:      Tue Nov 25 03:31:12 2014 +0000

description:
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 dd3f34e6a93f -r 98d2d3944107 sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c      Tue Nov 25 02:29:57 2014 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c      Tue Nov 25 03:31:12 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);